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

[Stefan Monnier]

Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.263 
emacs/lisp/international/mule-cmds.el:1.264
*** emacs/lisp/international/mule-cmds.el:1.263 Thu Jan 27 14:47:32 2005
--- emacs/lisp/international/mule-cmds.el       Thu Feb  3 16:06:33 2005
***************
*** 327,333 ****
        (or (local-variable-p 'buffer-file-coding-system buffer)
            (ucs-set-table-for-input buffer))))
  
!   (if default-enable-multibyte-characters
        (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.
--- 327,334 ----
        (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)))
!       ;; 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,1699 ****
--- 1695,1702 ----
  
    (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,2433 ****
--- 2431,2440 ----
          (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)