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 @@
+2000-05-08  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * international/mule-cmds.el (set-language-info-alist): Call
+        define-prefix-command with 3 arguments, to make the map suitable
+        for a menu.
+
 2000-05-07  Dave Love  <fx@gnu.org>
 
         * 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."
         (setup-map setup-language-environment-map))
     (if parents
         (let ((l parents)
-              map parent-symbol parent)
+              map parent-symbol parent prompt)
           (while l
             (if (symbolp (setq parent-symbol (car l)))
                 (setq parent (symbol-name parent))
               (setq parent parent-symbol parent-symbol (intern parent)))
             (setq map (lookup-key describe-map (vector parent-symbol)))
+            ;; This prompt string is for define-prefix-command, so
+            ;; that the map it creates will be suitable for a menu.
+            (or map (setq prompt (format "%s Environment" parent)))
             (if (not map)
                 (progn
                   (setq map (intern (format "describe-%s-environment-map"
                                             (downcase parent))))
-                  (define-prefix-command map)
+                  (define-prefix-command map nil prompt)
                   (define-key-after describe-map (vector parent-symbol)
                     (cons parent map) t)))
             (setq describe-map (symbol-value map))
@@ -725,7 +728,7 @@ in the European submenu in each of those two menus."
                 (progn
                   (setq map (intern (format "setup-%s-environment-map"
                                             (downcase parent))))
-                  (define-prefix-command map)
+                  (define-prefix-command map nil prompt)
                   (define-key-after setup-map (vector parent-symbol)
                     (cons parent map) t)))
             (setq setup-map (symbol-value map))