aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJim Blandy1993-06-22 08:17:36 +0000
committerJim Blandy1993-06-22 08:17:36 +0000
commit7e6992e06ecebb7729c645b880ed7b55eb597ab2 (patch)
treecc3b203f751d2cea4e3b40f3c5460881867a3988 /src
parent6ce387e698ea24b3cc94ddc302e7c646bb9b3ba4 (diff)
downloademacs-7e6992e06ecebb7729c645b880ed7b55eb597ab2.tar.gz
emacs-7e6992e06ecebb7729c645b880ed7b55eb597ab2.zip
* 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.
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 6a18aed16f9..4271f6c9df8 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3170,7 +3170,7 @@ menu_bar_items ()
3170#else 3170#else
3171 maps[nmaps-2] = current_buffer->keymap; 3171 maps[nmaps-2] = current_buffer->keymap;
3172#endif 3172#endif
3173 maps[nmaps-1] = global_map; 3173 maps[nmaps-1] = current_global_map;
3174 } 3174 }
3175 3175
3176 /* Look up in each map the dummy prefix key `menu-bar'. */ 3176 /* Look up in each map the dummy prefix key `menu-bar'. */
@@ -3740,7 +3740,7 @@ read_key_sequence (keybuf, bufsize, prompt)
3740#else 3740#else
3741 submaps[nmaps-2] = current_buffer->keymap; 3741 submaps[nmaps-2] = current_buffer->keymap;
3742#endif 3742#endif
3743 submaps[nmaps-1] = global_map; 3743 submaps[nmaps-1] = current_global_map;
3744 } 3744 }
3745 3745
3746 /* Find an accurate initial value for first_binding. */ 3746 /* Find an accurate initial value for first_binding. */