(current-language-environment): Set type according to

`language-info-alist' also here.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4ed085eacf8f4bb53e25ee4d1203b6eb240908e6..25a3dee2eeb0a52910dbac80fe60d814d7319f6c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-13  Markus Rost  <rost@math.ohio-state.edu>
+
+       * international/mule-cmds.el (current-language-environment): Set
+       type according to `language-info-alist' also here.
+
+       * progmodes/compile.el (compilation-menu-map): Use
+       `kill-compilation' to stop compilation.
+
 2002-12-13  Kenichi Handa  <handa@m17n.org>
 
        * language/european.el (encode-mac-roman): Fix last change.
@@ -15,7 +23,6 @@
        * international/subst-big5.el, international/subst-gb2312.el:
        * international/subst-jis.el, international/subst-ksc.el: New.
        
-
        * custom.el (defcustom, custom-set-variables): Doc fix.
 
        * emacs-lisp/bytecomp.el (byte-compile-if): Suppress warnings from

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 508be261b1d8453799dcb03d402f73f66aadf90b..2ee7c484bea7d4265de5df8ff97c90777d43a67e 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1505,8 +1505,14 @@ to using the function `set-language-environment'."
                          current-language-environment)
                        language-info-alist))
             "English"))
-  ;; a better custom type will be set with `set-language-info'.
-  :type 'string
+  ;; custom type will be updated with `set-language-info'.
+  :type (if language-info-alist
+           (cons 'choice (mapcar
+                          (lambda (lang)
+                            (list 'const (car lang)))
+                          (sort (copy-sequence language-info-alist)
+                                (lambda (x y) (string< (car x) (car y))))))
+         'string)
   :initialize 'custom-initialize-default
   :group 'mule)