changeset 34514:cd02b61654e4

(menu_bar_items, tool_bar_items): Set `autoload' when looking up `tool-bar' or `menu-bar' submap.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 13 Dec 2000 14:12:02 +0000
parents b3aae2798c47
children 35d7808fe9f6
files src/keyboard.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/keyboard.c	Wed Dec 13 13:25:16 2000 +0000
+++ b/src/keyboard.c	Wed Dec 13 14:12:02 2000 +0000
@@ -6306,8 +6306,8 @@
   for (mapno = nmaps - 1; mapno >= 0; mapno--)
     if (!NILP (maps[mapno]))
       {
-	def = get_keymap (access_keymap (maps[mapno], Qmenu_bar, 1, 0, 0),
-			  0, 0);
+	def = get_keymap (access_keymap (maps[mapno], Qmenu_bar, 1, 0, 1),
+			  0, 1);
 	if (CONSP (def))
 	  menu_bar_one_keymap (def);
       }
@@ -6959,8 +6959,7 @@
       {
 	Lisp_Object keymap;
 
-	/* Why set the `noinherit' flag ?  -sm  */
-	keymap = get_keymap (access_keymap (maps[i], Qtool_bar, 1, 1, 0), 0, 0);
+	keymap = get_keymap (access_keymap (maps[i], Qtool_bar, 1, 0, 1), 0, 1);
 	if (CONSP (keymap))
 	  {
 	    Lisp_Object tail;