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

[YAMAMOTO Mitsuharu]

Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.268 
emacs/lisp/international/mule-cmds.el:1.269
*** emacs/lisp/international/mule-cmds.el:1.268 Tue Mar 29 01:26:33 2005
--- emacs/lisp/international/mule-cmds.el       Thu Apr 14 09:29:16 2005
***************
*** 2395,2400 ****
--- 2395,2409 ----
                    (= 0 (length locale))) ; nil or empty string
          (setq locale (getenv (pop vars))))))
  
+     (unless (or locale (not (fboundp 'mac-get-preference)))
+       (setq locale (mac-get-preference "AppleLocale"))
+       (unless locale
+       (let ((languages (mac-get-preference "AppleLanguages")))
+         (unless (= (length languages) 0) ; nil or empty vector
+           (setq locale (aref languages 0))))))
+     (unless (or locale (not (boundp 'mac-system-locale)))
+       (setq locale mac-system-locale))
+ 
      (when locale
  
        ;; Translate "swedish" into "sv_SE.ISO8859-1", and so on,
***************
*** 2425,2431 ****
                 (when locale
                   (if (string-match "\\.\\(address@hidden)" locale)
                       (locale-charset-to-coding-system
!                       (match-string 1 locale)))))))
  
        (if (consp language-name)
            ;; locale-language-names specify both lang-env and coding.
--- 2434,2441 ----
                 (when locale
                   (if (string-match "\\.\\(address@hidden)" locale)
                       (locale-charset-to-coding-system
!                       (match-string 1 locale))))
!                (and (eq system-type 'macos) mac-system-coding-system))))
  
        (if (consp language-name)
            ;; locale-language-names specify both lang-env and coding.