aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2000-05-08 11:44:29 +0000
committerEli Zaretskii2000-05-08 11:44:29 +0000
commit9deed82f097e4ef87259013bcdf414a37ec1cbb6 (patch)
tree4e12e3cff5d654863cbd99fcd51f84a8d2455b13
parent4f37b78af843b8faaf5f8db9fdd552d3fbbe3be9 (diff)
downloademacs-9deed82f097e4ef87259013bcdf414a37ec1cbb6.tar.gz
emacs-9deed82f097e4ef87259013bcdf414a37ec1cbb6.zip
(set-language-info-alist): Call define-prefix-command with 3 arguments,
to make the map suitable for a menu.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/international/mule-cmds.el9
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68715a4f6a9..fcd2bba1111 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12000-05-08 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * international/mule-cmds.el (set-language-info-alist): Call
4 define-prefix-command with 3 arguments, to make the map suitable
5 for a menu.
6
12000-05-07 Dave Love <fx@gnu.org> 72000-05-07 Dave Love <fx@gnu.org>
2 8
3 * time.el: Small doc fixes from Pavel Janic. 9 * time.el: Small doc fixes from Pavel Janic.
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index ad0a29c25e0..401492f5dbe 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -706,17 +706,20 @@ in the European submenu in each of those two menus."
706 (setup-map setup-language-environment-map)) 706 (setup-map setup-language-environment-map))
707 (if parents 707 (if parents
708 (let ((l parents) 708 (let ((l parents)
709 map parent-symbol parent) 709 map parent-symbol parent prompt)
710 (while l 710 (while l
711 (if (symbolp (setq parent-symbol (car l))) 711 (if (symbolp (setq parent-symbol (car l)))
712 (setq parent (symbol-name parent)) 712 (setq parent (symbol-name parent))
713 (setq parent parent-symbol parent-symbol (intern parent))) 713 (setq parent parent-symbol parent-symbol (intern parent)))
714 (setq map (lookup-key describe-map (vector parent-symbol))) 714 (setq map (lookup-key describe-map (vector parent-symbol)))
715 ;; This prompt string is for define-prefix-command, so
716 ;; that the map it creates will be suitable for a menu.
717 (or map (setq prompt (format "%s Environment" parent)))
715 (if (not map) 718 (if (not map)
716 (progn 719 (progn
717 (setq map (intern (format "describe-%s-environment-map" 720 (setq map (intern (format "describe-%s-environment-map"
718 (downcase parent)))) 721 (downcase parent))))
719 (define-prefix-command map) 722 (define-prefix-command map nil prompt)
720 (define-key-after describe-map (vector parent-symbol) 723 (define-key-after describe-map (vector parent-symbol)
721 (cons parent map) t))) 724 (cons parent map) t)))
722 (setq describe-map (symbol-value map)) 725 (setq describe-map (symbol-value map))
@@ -725,7 +728,7 @@ in the European submenu in each of those two menus."
725 (progn 728 (progn
726 (setq map (intern (format "setup-%s-environment-map" 729 (setq map (intern (format "setup-%s-environment-map"
727 (downcase parent)))) 730 (downcase parent))))
728 (define-prefix-command map) 731 (define-prefix-command map nil prompt)
729 (define-key-after setup-map (vector parent-symbol) 732 (define-key-after setup-map (vector parent-symbol)
730 (cons parent map) t))) 733 (cons parent map) t)))
731 (setq setup-map (symbol-value map)) 734 (setq setup-map (symbol-value map))