summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Heuer <kwzh@gnu.org>1996-01-09 23:39:59 +0000
committerKarl Heuer <kwzh@gnu.org>1996-01-09 23:39:59 +0000
commit2d271c9f632e2179351a3e277539e5c71c26a81a (patch)
tree56a06217fd23c5a077fe735ac26049896a737824
parentd4aa40750883fcdfd0cfb4a57a8648b618192b06 (diff)
downloademacs-2d271c9f632e2179351a3e277539e5c71c26a81a.tar.gz
(describe_map): New arg nomenu.
(describe_map_tree): Pass that arg.
-rw-r--r--src/keymap.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/keymap.c b/src/keymap.c
index 4970e790503..43a9fb935da 100644
--- 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. */