Show
Ignore:
Timestamp:
09/10/05 10:16:00 (3 years ago)
Author:
miyoshi
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/international/mule-cmds.el

    r3801 r3863  
    3333  (defvar dos-codepage) 
    3434  (autoload 'widget-value "wid-edit")) 
     35 
     36(defvar mac-system-coding-system) 
     37(defvar mac-system-locale) 
    3538 
    3639;;; MULE related key bindings and menus. 
    …… 
    24432446          (setq locale (getenv (pop vars)))))) 
    24442447 
    2445     (unless (or locale (not (fboundp 'mac-get-preference))) 
    2446       (setq locale (mac-get-preference "AppleLocale")) 
    2447       (unless locale 
    2448         (let ((languages (mac-get-preference "AppleLanguages"))) 
    2449           (unless (= (length languages) 0) ; nil or empty vector 
    2450             (setq locale (aref languages 0)))))) 
     2448    (unless locale 
     2449      ;; The two tests are kept separate so the byte-compiler sees 
     2450      ;; that mac-get-preference is only called after checking its existence. 
     2451      (when (fboundp 'mac-get-preference) 
     2452        (setq locale (mac-get-preference "AppleLocale")) 
     2453        (unless locale 
     2454          (let ((languages (mac-get-preference "AppleLanguages"))) 
     2455            (unless (= (length languages) 0) ; nil or empty vector 
     2456              (setq locale (aref languages 0))))))) 
    24512457    (unless (or locale (not (boundp 'mac-system-locale))) 
    24522458      (setq locale mac-system-locale))