changeset 90668:d677464a3fad

(set-default-coding-systems): Sync with HEAD.
author Kenichi Handa <handa@m17n.org>
date Wed, 22 Nov 2006 01:03:19 +0000
parents dbe3f29e61d6
children 664b50fcda5b
files lisp/international/mule-cmds.el
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/international/mule-cmds.el	Tue Nov 21 08:56:38 2006 +0000
+++ b/lisp/international/mule-cmds.el	Wed Nov 22 01:03:19 2006 +0000
@@ -340,9 +340,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 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)