aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJim Blandy1993-07-15 04:58:59 +0000
committerJim Blandy1993-07-15 04:58:59 +0000
commitae450a9555f2736335934a7eb6246284dd2e2752 (patch)
tree3e21570d29dde0a2015a0e61874c0af4aa246b66 /src
parent991298c3fc3516cce4de363df2ee9c44f8ab54ba (diff)
downloademacs-ae450a9555f2736335934a7eb6246284dd2e2752.tar.gz
emacs-ae450a9555f2736335934a7eb6246284dd2e2752.zip
* keyboard.c (menu_bar_one_keymap): If the key's binding is the
symbol `undefined', don't try to take that symbol's cdr before passing it to menu_bar_item; pass the `undefined' binding itself, so menu_bar_item can remove bindings for the same key from result.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 21bdb6c16bd..c840979c88f 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3235,7 +3235,7 @@ menu_bar_one_keymap (keymap, result)
3235 } 3235 }
3236 else if (EQ (binding, Qundefined)) 3236 else if (EQ (binding, Qundefined))
3237 result = menu_bar_item (key, item_string, 3237 result = menu_bar_item (key, item_string,
3238 Fcdr (binding), result); 3238 binding, result);
3239 } 3239 }
3240 else if (XTYPE (item) == Lisp_Vector) 3240 else if (XTYPE (item) == Lisp_Vector)
3241 { 3241 {
@@ -3256,7 +3256,7 @@ menu_bar_one_keymap (keymap, result)
3256 } 3256 }
3257 else if (EQ (binding, Qundefined)) 3257 else if (EQ (binding, Qundefined))
3258 result = menu_bar_item (key, item_string, 3258 result = menu_bar_item (key, item_string,
3259 Fcdr (binding), result); 3259 binding, result);
3260 } 3260 }
3261 } 3261 }
3262 } 3262 }