# HG changeset patch
# User Markus Rost <rost@math.uni-bielefeld.de>
# Date 1039654291 0
# Node ID 47c6ac3517f83d93068e71e7f9bda6232a2c796e
# Parent  60a4a6de56334956e5af69568aa8dc3c83d674de
(set-language-info): Update custom-type of
current-language-environment directly without a function call.
(current-language-environment-custom-type): Deleted.

diff -r 60a4a6de5633 -r 47c6ac3517f8 lisp/international/mule-cmds.el
--- a/lisp/international/mule-cmds.el	Thu Dec 12 00:27:36 2002 +0000
+++ b/lisp/international/mule-cmds.el	Thu Dec 12 00:51:31 2002 +0000
@@ -986,8 +986,13 @@
 	  (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 @@
 	  (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