(set-language-info): Update custom-type of

current-language-environment directly without a function call.
(current-language-environment-custom-type): Deleted.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6fd33f093d43d0c7cddc2bfedb16503f6013e054..59736b5d272d5142740f5b7154749da085a3f067 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,9 @@
-2002-12-11  Markus Rost  <rost@math.ohio-state.edu>
+2002-12-12  Markus Rost  <rost@math.ohio-state.edu>
 
-       * international/mule-cmds.el
-       (current-language-environment-custom-type): New fun.
-       (set-language-info): Use it.
-       (current-language-environment): Fix custom type.
+       * international/mule-cmds.el (current-language-environment): Fix
+       custom type.
+       (set-language-info): Update custom-type of
+       current-language-environment.
 
 2002-12-11  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index ed4e23497d11d76f4089c0b919d9b26eac7c4ed8..508be261b1d8453799dcb03d402f73f66aadf90b 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -986,8 +986,13 @@ see `language-info-alist'."
          (setq key-slot (list key))
          (setcdr lang-slot (cons key-slot (cdr lang-slot)))))
     (setcdr key-slot (purecopy info))
+    ;; Update the custom-type of `current-language-environment'.
     (put 'current-language-environment 'custom-type
-        (current-language-environment-custom-type))))
+        (cons 'choice (mapcar
+                       (lambda (lang)
+                         (list 'const (car lang)))
+                       (sort (copy-sequence language-info-alist)
+                             (lambda (x y) (string< (car x) (car y)))))))))
 
 (defun set-language-info-alist (lang-env alist &optional parents)
   "Store ALIST as the definition of language environment LANG-ENV.
@@ -1487,15 +1492,6 @@ This hook is mainly used for canceling the effect of
          (customize-mark-as-set 'current-language-environment))
       (error "Bogus calling sequence"))))
 
-(defun current-language-environment-custom-type ()
-  "Return a custom type for `current-language-environment'.
-This is based on `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)))))))
-
 (defcustom current-language-environment "English"
   "The last language environment specified with `set-language-environment'.
 This variable should be set only with \\[customize], which is equivalent