# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1220253303 0
# Node ID 358ab4e4f102fa8c87b94a4af155c0c638a50dc6
# Parent  1741183c4f3c429d5711d7da8f71361115b041ef
(set-language-environment): Don't
overwrite current-iso639-language if the current language
environment doesn't provide that data.
(set-locale-environment): Set current-iso639-language from the
locale name.

diff -r 1741183c4f3c -r 358ab4e4f102 lisp/international/mule-cmds.el
--- a/lisp/international/mule-cmds.el	Mon Sep 01 07:11:28 2008 +0000
+++ b/lisp/international/mule-cmds.el	Mon Sep 01 07:15:03 2008 +0000
@@ -1842,7 +1842,8 @@
 	(funcall func)))
 
   (setq current-iso639-language
-	(get-language-info language-name 'iso639-language))
+	(or (get-language-info language-name 'iso639-language)
+	    current-iso639-language))
 
   (run-hooks 'set-language-environment-hook)
   (force-mode-line-update t))
@@ -2510,7 +2511,10 @@
       ;; want to set them to the same value as LC_CTYPE.
       (when locale-name
 	(setq system-messages-locale locale)
-	(setq system-time-locale locale)))
+	(setq system-time-locale locale))
+
+      (if (string-match "^[a-z][a-z]" locale)
+	  (setq current-iso639-language (intern (match-string 0 locale)))))
 
     (setq woman-locale
           (or system-messages-locale