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 /lisp/cus-start.el | |
| 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 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 2bc47426332..2e442b6c944 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -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 |