diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2016-11-28 17:43:25 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2016-11-28 17:43:25 +0200 |
| commit | 5878abf87b6b3ead1367cbae5cc6b0743349f611 (patch) | |
| tree | 83fef8ba83ca1733c6a95e3201db9be45558ba07 /src/w32.h | |
| parent | 46065291fa0807a10180b958285f5d375cf05914 (diff) | |
| download | emacs-5878abf87b6b3ead1367cbae5cc6b0743349f611.tar.gz | |
Fix 'expand-file-name' during startup on MS-Windows
* src/w32.c (w32_init_file_name_codepage): New function, resets
file_name_codepage and w32_ansi_code_page to undo the values
recorded during dumping.
(codepage_for_filenames): Fix an embarrassing typo. Ignore the
cached value of file-name encoding if it is nil, i.e. not
initialized yet. Actually cache the last used file-name encoding
to avoid calling APIs when not necessary.
* src/w32.h (w32_init_file_name_codepage): Add prototype.
* src/w32term.c (syms_of_w32term): Set the value of
w32_unicode_filenames according to the OS version. This avoids
resetting it during startup, which then causes temacs to run with
the incorrect value.
* src/emacs.c (main): Call w32_init_file_name_codepage early
during the startup.
* src/fileio.c (Fexpand_file_name) [WINDOWSNT]: Update 'newdir'
after converting $HOME to a UTF-8 string, so that 'newdirlim' is
consistent with it. (Bug#25038)
* lisp/international/mule-cmds.el (set-locale-environment): Set
'default-file-name-coding-system' to the ANSI codepage even in
non-interactive sessions.
* lisp/files.el (directory-abbrev-alist, abbreviated-home-dir):
Doc fix.
(abbreviate-file-name): Decode 'abbreviated-home-dir' if it is a
unibyte string.
* doc/lispref/files.texi (Directory Names): Index
'directory-abbrev-alist'.
Diffstat (limited to 'src/w32.h')
| -rw-r--r-- | src/w32.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/w32.h b/src/w32.h index 42a1c423ce7..08b88f5f5a0 100644 --- a/src/w32.h +++ b/src/w32.h @@ -195,6 +195,7 @@ extern int filename_from_ansi (const char *, char *); extern int filename_to_ansi (const char *, char *); extern int filename_from_utf16 (const wchar_t *, char *); extern int filename_to_utf16 (const char *, wchar_t *); +extern void w32_init_file_name_codepage (void); extern int codepage_for_filenames (CPINFO *); extern Lisp_Object ansi_encode_filename (Lisp_Object); extern int w32_copy_file (const char *, const char *, int, int, int); |