* keyboard.c (menu_bar_items, read_key_sequence): Use

	current_global_map, not global_map; the latter is only meant to be
	used for initial_define_key.
	* commands.h: Doc fix.

diff --git a/src/keyboard.c b/src/keyboard.c
index 6a18aed16f99bad67570fdd069e85ce647825977..4271f6c9df872b2fb079b6b09005e3d7f183bcdc 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3170,7 +3170,7 @@ menu_bar_items ()
 #else
     maps[nmaps-2] = current_buffer->keymap;
 #endif
-    maps[nmaps-1] = global_map;
+    maps[nmaps-1] = current_global_map;
   }
 
   /* Look up in each map the dummy prefix key `menu-bar'.  */
@@ -3740,7 +3740,7 @@ read_key_sequence (keybuf, bufsize, prompt)
 #else
     submaps[nmaps-2] = current_buffer->keymap;
 #endif
-    submaps[nmaps-1] = global_map;
+    submaps[nmaps-1] = current_global_map;
   }
 
   /* Find an accurate initial value for first_binding.  */