procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up read_key_sequence a bit; reread active keymaps after first event.

Browse source 
* 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.
This commit is contained in:
Stefan Monnier 2013-02-11 14:21:23 -05:00
parent f5e1b6804d
commit 99d0d6dc23
8 changed files with 153 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lisp/cus-start.el
View file

@ -286,7 +286,6 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
(double-click-time mouse (restricted-sexp
:match-alternatives (integerp 'nil 't)))
(double-click-fuzz mouse integer "22.1")
(inhibit-local-menu-bar-menus menu boolean)
(help-char keyboard character)
(help-event-list keyboard (repeat (sexp :format "%v")))
(menu-prompting menu boolean)
@ -301,15 +300,15 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
(const :tag "When sent SIGUSR2" sigusr2))
"24.1")
;; This is not good news because it will use the wrong
;; version-specific directories when you upgrade. We need
;; customization of the front of the list, maintaining the standard
;; value intact at the back.
;;; (load-path environment
;;; (repeat (choice :tag "[Current dir?]"
;;; :format "%[Current dir?%] %v"
;;; (const :tag " current dir" nil)
;;; (directory :format "%v"))))
;; This is not good news because it will use the wrong
;; version-specific directories when you upgrade. We need
;; customization of the front of the list, maintaining the
;; standard value intact at the back.
;;(load-path environment
;; (repeat (choice :tag "[Current dir?]"
;; :format "%[Current dir?%] %v"
;; (const :tag " current dir" nil)
;; (directory :format "%v"))))
;; minibuf.c
(enable-recursive-minibuffers minibuffer boolean)
(history-length minibuffer