(describe_map): New arg nomenu.

(describe_map_tree): Pass that arg.

diff --git a/src/keymap.c b/src/keymap.c
index 4970e79050316dce69d4310cfc059fd999bf5afd..43a9fb935da515c11b8eb21089b647a8257dcfb4 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2069,7 +2069,7 @@ key             binding\n\
 
       describe_map (Fcdr (elt), Fcar (elt),
                    transl ? describe_translation : describe_command,
-                   partial, sub_shadows, &seen);
+                   partial, sub_shadows, &seen, nomenu);
 
     skip: ;
     }
@@ -2155,16 +2155,17 @@ shadow_lookup (shadow, key, flag)
 
 /* Describe the contents of map MAP, assuming that this map itself is
    reached by the sequence of prefix keys KEYS (a string or vector).
-   PARTIAL, SHADOW are as in `describe_map_tree' above.  */
+   PARTIAL, SHADOW, NOMENU are as in `describe_map_tree' above.  */
 
 static void
-describe_map (map, keys, elt_describer, partial, shadow, seen)
+describe_map (map, keys, elt_describer, partial, shadow, seen, nomenu)
      register Lisp_Object map;
      Lisp_Object keys;
      int (*elt_describer) ();
      int partial;
      Lisp_Object shadow;
      Lisp_Object *seen;
+     int nomenu;
 {
   Lisp_Object elt_prefix;
   Lisp_Object tail, definition, event;
@@ -2210,6 +2211,9 @@ describe_map (map, keys, elt_describer, partial, shadow, seen)
          if (! (SYMBOLP (event) || INTEGERP (event)))
            continue;
 
+         if (nomenu && EQ (event, Qmenu_bar))
+           continue;
+
          definition = get_keyelt (XCONS (XCONS (tail)->car)->cdr, 0);
 
          /* Don't show undefined commands or suppressed commands.  */