From: Kenichi Handa Date: Wed, 8 Nov 2006 07:34:24 +0000 (+0000) Subject: (set-default-coding-systems): Always X-Git-Tag: emacs-pretest-22.0.91~220 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b2020e89330a16f31d1123e6dc4df26af0e830a8;p=emacs.git (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 de966981171..d530721d9ce 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-11-08 Kenichi Handa + + * 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 * makefile.w32-in (setwins): Remove. diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 6edc0a4daac..fc461bffe2c 100644 --- 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)