(set-locale-environment): Soothe compiler.

1 files changed, 9 insertions, 6 deletions

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 5fefc2f31cb..c79349f3e57 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2445,12 +2445,15 @@ See also `locale-charset-language-names', `locale-language-names',
                     (= 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 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))