From 590dbcbaa6a2e1a06a589e2ba779c50c5a855e5b Mon Sep 17 00:00:00 2001 From: Markus Rost Date: Wed, 11 Dec 2002 21:29:31 +0000 Subject: [PATCH] (current-language-environment-custom-type): New fun. (set-language-info): Use it. (current-language-environment): Fix custom type. --- lisp/ChangeLog | 7 +++++++ lisp/international/mule-cmds.el | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6453121bebc..6fd33f093d4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2002-12-11 Markus Rost + + * international/mule-cmds.el + (current-language-environment-custom-type): New fun. + (set-language-info): Use it. + (current-language-environment): Fix custom type. + 2002-12-11 Pavel Jan,Bm(Bk * progmodes/antlr-mode.el (antlr): New URL. diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index aa33a39352b..3d824de6b46 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -985,7 +985,9 @@ see `language-info-alist'." (progn (setq key-slot (list key)) (setcdr lang-slot (cons key-slot (cdr lang-slot))))) - (setcdr key-slot (purecopy info)))) + (setcdr key-slot (purecopy info)) + (put 'current-language-environment 'custom-type + (current-language-environment-custom-type)))) (defun set-language-info-alist (lang-env alist &optional parents) "Store ALIST as the definition of language environment LANG-ENV. @@ -1485,6 +1487,13 @@ 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))) + language-info-alist))) + (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 @@ -1498,9 +1507,8 @@ to using the function `set-language-environment'." current-language-environment) language-info-alist)) "English")) - :type (cons 'choice (mapcar (lambda (lang) - (list 'const (car lang))) - language-info-alist)) + ;; a better custom type will be set with `set-language-info'. + :type 'string :initialize 'custom-initialize-default :group 'mule) -- 2.39.2