diff options
| author | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2016-11-28 06:55:14 +0100 |
|---|---|---|
| committer | Thierry Volpiatto <thierry.volpiatto@gmail.com> | 2016-11-28 06:59:49 +0100 |
| commit | 43ec6efa2b41b43a2e55be16434f64bba644271e (patch) | |
| tree | 7441f3115eb9cc0eba6d65ffde85363ac7282b5b | |
| parent | d9dd884c7c1940cacfcc2d86d47220b40c520bb5 (diff) | |
| download | emacs-43ec6efa2b41b43a2e55be16434f64bba644271e.tar.gz | |
Reuse already existing lisp symbols for ignore_event (bug#19547).
* lisp/subr.el (while-no-input-ignore-events): Use them instead.
* src/keyboard.c (kbd_buffer_store_buffered_event):
Use help-echo for HELP_EVENT, iconify-frame for ICONIFY_EVENT,
and make-frame-visible for DEICONIFY_EVENT.
(syms_of_keyboard): Remove unneeded symbols.
| -rw-r--r-- | lisp/subr.el | 3 | ||||
| -rw-r--r-- | src/keyboard.c | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lisp/subr.el b/lisp/subr.el index 73f7f3e0d12..5da5bf8388a 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3337,7 +3337,8 @@ is allowed once again. (Immediately, if `inhibit-quit' is nil.)" ;; Don't throw `throw-on-input' on those events by default. (setq while-no-input-ignore-events - '(focus-in focus-out help iconify deiconify selection-request)) + '(focus-in focus-out help-echo iconify-frame + make-frame-visible selection-request)) (defmacro while-no-input (&rest body) "Execute BODY only as long as there's no pending input. diff --git a/src/keyboard.c b/src/keyboard.c index 6d509dd42be..dadc3ac2d7b 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3573,9 +3573,9 @@ kbd_buffer_store_buffered_event (union buffered_input_event *event, { case FOCUS_IN_EVENT: ignore_event = Qfocus_in; break; case FOCUS_OUT_EVENT: ignore_event = Qfocus_out; break; - case HELP_EVENT: ignore_event = Qhelp; break; - case ICONIFY_EVENT: ignore_event = Qiconify; break; - case DEICONIFY_EVENT: ignore_event = Qdeiconify; break; + case HELP_EVENT: ignore_event = Qhelp_echo; break; + case ICONIFY_EVENT: ignore_event = Qiconify_frame; break; + case DEICONIFY_EVENT: ignore_event = Qmake_frame_visible; break; case SELECTION_REQUEST_EVENT: ignore_event = Qselection_request; break; } @@ -11172,9 +11172,6 @@ syms_of_keyboard (void) DEFSYM (Qiconify_frame, "iconify-frame"); DEFSYM (Qmake_frame_visible, "make-frame-visible"); DEFSYM (Qselect_window, "select-window"); - DEFSYM (Qhelp, "help"); - DEFSYM (Qiconify, "iconify"); - DEFSYM (Qdeiconify, "deiconify"); DEFSYM (Qselection_request, "selection-request"); { int i; |