[Emacs-diffs] Changes to emacs/lisp/international/mule-cmds.el,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   06/11/08 07:33:40

Index: mule-cmds.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/mule-cmds.el,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -b -r1.298 -r1.299
--- mule-cmds.el        5 Oct 2006 14:46:26 -0000       1.298
+++ mule-cmds.el        8 Nov 2006 07:33:40 -0000       1.299
@@ -337,11 +337,13 @@
        (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))
+  (if (eq system-type 'darwin)
+      ;; The file-name coding system on Darwin systems is always utf-8.
+      (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))))
-      ;; 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 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)