From: Markus Rost <rost@math.uni-bielefeld.de>
Date: Thu, 12 Dec 2002 00:52:05 +0000 (+0000)
Subject: (set-language-info): Update custom-type of
X-Git-Tag: ttn-vms-21-2-B4~12036
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1169bd863a0a7a8c9a49039e4dd1a9860845cf1d;p=emacs.git

(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 6fd33f093d4..59736b5d272 100644
--- 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,Bm(Bk  <Pavel@Janik.cz>
 
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index ed4e23497d1..508be261b1d 100644
--- 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