# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 821230799 0
# Node ID d0b95da4f1f27669df2a34881c343f931d29c6f3
# Parent  6b1ecb157b48c750b9b5a4f2f1c40b702d379dd0
(describe_map): New arg nomenu.
(describe_map_tree): Pass that arg.

diff -r 6b1ecb157b48 -r d0b95da4f1f2 src/keymap.c
--- a/src/keymap.c	Tue Jan 09 23:39:43 1996 +0000
+++ b/src/keymap.c	Tue Jan 09 23:39:59 1996 +0000
@@ -2069,7 +2069,7 @@
 
       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 @@
 
 /* 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 @@
 	  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.  */