diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-02-11 14:21:23 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-02-11 14:21:23 -0500 |
| commit | 99d0d6dc23f0fd2ee6d64f0f18a33f2b791c642d (patch) | |
| tree | 2cd8a54c22c9354415306c76bd65dddde723532f /src/keyboard.h | |
| parent | f5e1b6804dc2307983e4c55d4d6530549ddccbb7 (diff) | |
| download | emacs-99d0d6dc23f0fd2ee6d64f0f18a33f2b791c642d.tar.gz | |
Clean up read_key_sequence a bit; reread active keymaps after first event.
* src/keyboard.c (read_char, read_char_x_menu_prompt)
(read_char_minibuf_menu_prompt):
Replace nmaps+maps with a single `map' arg.
(follow_key): Operate on a single map.
(active_maps): New function.
(test_undefined): Also return true for nil bindings.
(read_key_sequence): Use active_maps to replace the arrays of keymaps with
a single (composed) keymap. Remember `first_event' to choose the right
set of active keymaps. Recompute the set of keymaps after receiving
the first event. Remove GOBBLE_FIRST_EVENT.
(syms_of_keyboard): Remove inhibit_local_menu_bar_menus.
* src/keyboard.h (read_char): Update declaration.
* src/lread.c (read_filtered_event): Adjust call to read_char.
* lisp/cus-start.el (all): Remove inhibit-local-menu-bar-menus.
Diffstat (limited to 'src/keyboard.h')
| -rw-r--r-- | src/keyboard.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keyboard.h b/src/keyboard.h index 7ffb436754b..c6ade35dd52 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -482,7 +482,7 @@ struct input_event; extern Lisp_Object parse_modifiers (Lisp_Object); extern Lisp_Object reorder_modifiers (Lisp_Object); -extern Lisp_Object read_char (int, ptrdiff_t, Lisp_Object *, Lisp_Object, +extern Lisp_Object read_char (int, Lisp_Object, Lisp_Object, bool *, EMACS_TIME *); extern int parse_solitary_modifier (Lisp_Object symbol); |