[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.280 
emacs/lisp/international/mule-cmds.el:1.281
*** emacs/lisp/international/mule-cmds.el:1.280 Mon Aug 29 14:08:30 2005
--- emacs/lisp/international/mule-cmds.el       Thu Sep  1 14:30:30 2005
***************
*** 2445,2456 ****
                    (= 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))
  
--- 2445,2459 ----
                    (= 0 (length locale))) ; nil or empty string
          (setq locale (getenv (pop vars))))))
  
!     (unless locale
!       ;; The two tests are kept separate so the byte-compiler sees
!       ;; that mac-get-preference is only called after checking its existence.
!       (when (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))