aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Blandy1993-06-22 08:17:26 +0000
committerJim Blandy1993-06-22 08:17:26 +0000
commit6ce387e698ea24b3cc94ddc302e7c646bb9b3ba4 (patch)
tree2e5f57c6ff00d478090a853b63f7bf2a3eac637b
parent384c7da48720aaf10a223aa20cd88ab685a48d35 (diff)
downloademacs-6ce387e698ea24b3cc94ddc302e7c646bb9b3ba4.tar.gz
emacs-6ce387e698ea24b3cc94ddc302e7c646bb9b3ba4.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. * commands.h (Vglobal_mouse_map): Removed; unused. * xfns.c (Vglobal_mouse_map): Same.
-rw-r--r--src/commands.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/commands.h b/src/commands.h
index 4abdcac56f1..0f733aeb42c 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -20,18 +20,14 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
20 20
21#define Ctl(c) ((c)&037) 21#define Ctl(c) ((c)&037)
22 22
23/* Define the names of keymaps, just so people can refer to 23/* Define the names of keymaps, just so people can refer to them in
24 them in calls to initial_define_key */ 24 calls to initial_define_key. These should *not* be used after
25 25 initialization; use-global-map doesn't affect these; it sets
26 current_global_map instead. */
26extern Lisp_Object global_map; 27extern Lisp_Object global_map;
27
28extern Lisp_Object meta_map; 28extern Lisp_Object meta_map;
29
30extern Lisp_Object control_x_map; 29extern Lisp_Object control_x_map;
31 30
32/* Keymap for mouse commands. */
33extern Lisp_Object Vglobal_mouse_map;
34
35extern Lisp_Object Vminibuffer_local_map; 31extern Lisp_Object Vminibuffer_local_map;
36 32
37extern Lisp_Object Vminibuffer_local_ns_map; 33extern Lisp_Object Vminibuffer_local_ns_map;