(set-default-coding-systems): Always

set default-file-name-coding-system to utf-8 for Mac Darwin.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de96698117179a0bdac180020d5fa9a2a53eea20..d530721d9cee5a9985bc65f3364bec4b3bcb88f1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-08  Kenichi Handa  <handa@m17n.org>
+
+       * international/mule-cmds.el (set-default-coding-systems): Always
+       set default-file-name-coding-system to utf-8 for Mac Darwin.
+
 2006-11-08  Juanma Barranquero  <lekktu@gmail.com>
 
        * makefile.w32-in (setwins): Remove.

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 6edc0a4daac02ec0dd72997f135bdcec4e42aaa3..fc461bffe2c4b90dfb23d12abe8dda6e72400fbf 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -337,11 +337,13 @@ This also sets the following values:
        (or (local-variable-p 'buffer-file-coding-system buffer)
            (ucs-set-table-for-input buffer))))
 
-  (if (and default-enable-multibyte-characters (not (eq system-type 'darwin))
-          (or (not coding-system)
-              (not (coding-system-get coding-system 'ascii-incompatible))))
+  (if (eq system-type 'darwin)
       ;; The file-name coding system on Darwin systems is always utf-8.
-      (setq default-file-name-coding-system coding-system))
+      (setq default-file-name-coding-system 'utf-8)
+    (if (and default-enable-multibyte-characters
+            (or (not coding-system)
+                (not (coding-system-get coding-system 'ascii-incompatible))))
+       (setq default-file-name-coding-system coding-system)))
   ;; If coding-system is nil, honor that on MS-DOS as well, so
   ;; that they could reset the terminal coding system.
   (unless (and (eq window-system 'pc) coding-system)