(set-locale-environment): Set default-file-name-coding-system _after_

keyboard and terminal coding systems.  This fixes last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fca25ad829b1c2c1a22249cb38007fc023ea6faa..ef27cfa60e46841a82460099625c8ea0b5a95535 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-16  Eli Zaretskii  <eliz@gnu.org>
 
+       * international/mule-cmds.el (set-locale-environment): Set
+       default-file-name-coding-system _after_ keyboard and terminal
+       coding systems.  This fixes last change.
+
        * mail/rmail.el (rmail-current-subject-regexp): Allow more than
        one space after "Subject:".
 

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index bd2d03eb5d49c726ef24d23031632ec11547332a..6dd1bf07213a5cba1c0245d0421eb2e752ee2aa6 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2615,9 +2615,18 @@ See also `locale-charset-language-names', `locale-language-names',
       (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page))))
        (when (coding-system-p code-page-coding)
          (setq locale-coding-system code-page-coding)
-          (setq default-file-name-coding-system code-page-coding)
          (set-keyboard-coding-system code-page-coding)
-         (set-terminal-coding-system code-page-coding))))
+         (set-terminal-coding-system code-page-coding)
+         ;; Set default-file-name-coding-system last, so that Emacs
+         ;; doesn't try to use cpNNNN when it defines keyboard and
+         ;; terminal encoding.  That's because the above two lines
+         ;; will want to load code-pages.el, where cpNNNN are
+         ;; defined; if default-file-name-coding-system were set to
+         ;; cpNNNN while these two lines run, Emacs will want to use
+         ;; it for encoding the file name it wants to load.  And that
+         ;; will fail, since cpNNNN is not yet usable until
+         ;; code-pages.el finishes loading.
+         (setq default-file-name-coding-system code-page-coding))))
 
     (when (eq system-type 'darwin)
       ;; On Darwin, file names are always encoded in utf-8, no matter