diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c7ab3fb44a..708a20b140 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2005-02-03 Stefan <[email protected]> + + * international/mule-cmds.el (set-locale-environment): Set file-name + coding system to utf-8 on Darwin systems. + (set-default-coding-systems): Don't set default-file-name-coding-system + on Darwin systems. + 2005-02-03 Richard M. Stallman <[email protected]> * hi-lock.el (hi-lock-mode): Turning on Hi-Lock turns on Font-Lock. diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index cf004fe5eb..2b3af4d7e5 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -327,7 +327,8 @@ This also sets the following values: (or (local-variable-p 'buffer-file-coding-system buffer) (ucs-set-table-for-input buffer)))) - (if default-enable-multibyte-characters + (if (and default-enable-multibyte-characters (not (eq system-type 'darwin))) + ;; The file-name coding system on Darwin systems is always utf-8. (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. @@ -1694,6 +1695,8 @@ The default status is as follows: (set-default-coding-systems nil) (setq default-sendmail-coding-system 'iso-latin-1) + ;; On Darwin systems, this should be utf-8, but when this file is loaded + ;; utf-8 is not yet defined, so we set it in set-locale-environment instead. (setq default-file-name-coding-system 'iso-latin-1) ;; Preserve eol-type from existing default-process-coding-systems. ;; On non-unix-like systems in particular, these may have been set @@ -2428,6 +2431,10 @@ See also `locale-charset-language-names', `locale-language-names', (set-keyboard-coding-system code-page-coding) (set-terminal-coding-system code-page-coding)))) + ;; On Darwin, file names are always encoded in utf-8, no matter the locale. + (when (eq system-type 'darwin) + (setq default-file-name-coding-system 'utf-8)) + ;; Default to A4 paper if we're not in a C, POSIX or US locale. ;; (See comments in Flocale_info.) (let ((locale locale) |