(set-default-coding-systems): Sync

with HEAD.

1 files changed, 6 insertions, 2 deletions

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 3eebb3e7b51..8f0de253a15 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -340,9 +340,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)))
+  (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)
+                 (coding-system-get coding-system 'ascii-compatible-p)))
+        (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)