aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/keyboard.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 26d35936316..13b93fb390e 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6306,8 +6306,8 @@ menu_bar_items (old)
6306 for (mapno = nmaps - 1; mapno >= 0; mapno--) 6306 for (mapno = nmaps - 1; mapno >= 0; mapno--)
6307 if (!NILP (maps[mapno])) 6307 if (!NILP (maps[mapno]))
6308 { 6308 {
6309 def = get_keymap (access_keymap (maps[mapno], Qmenu_bar, 1, 0, 0), 6309 def = get_keymap (access_keymap (maps[mapno], Qmenu_bar, 1, 0, 1),
6310 0, 0); 6310 0, 1);
6311 if (CONSP (def)) 6311 if (CONSP (def))
6312 menu_bar_one_keymap (def); 6312 menu_bar_one_keymap (def);
6313 } 6313 }
@@ -6959,8 +6959,7 @@ tool_bar_items (reuse, nitems)
6959 { 6959 {
6960 Lisp_Object keymap; 6960 Lisp_Object keymap;
6961 6961
6962 /* Why set the `noinherit' flag ? -sm */ 6962 keymap = get_keymap (access_keymap (maps[i], Qtool_bar, 1, 0, 1), 0, 1);
6963 keymap = get_keymap (access_keymap (maps[i], Qtool_bar, 1, 1, 0), 0, 0);
6964 if (CONSP (keymap)) 6963 if (CONSP (keymap))
6965 { 6964 {
6966 Lisp_Object tail; 6965 Lisp_Object tail;