From 990a41084b6a63674f6c1060b5b42ea1c95da08f Mon Sep 17 00:00:00 2001 From: Markus Rost Date: Fri, 13 Dec 2002 22:42:21 +0000 Subject: [PATCH] (current-language-environment): Set type according to `language-info-alist' also here. --- lisp/ChangeLog | 9 ++++++++- lisp/international/mule-cmds.el | 10 ++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4ed085eacf8..25a3dee2eeb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2002-12-13 Markus Rost + + * 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 * 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 508be261b1d..2ee7c484bea 100644 --- 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) -- 2.11.4.GIT