aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThierry Volpiatto2016-11-28 06:55:14 +0100
committerThierry Volpiatto2016-11-28 06:59:49 +0100
commit43ec6efa2b41b43a2e55be16434f64bba644271e (patch)
tree7441f3115eb9cc0eba6d65ffde85363ac7282b5b /src
parentd9dd884c7c1940cacfcc2d86d47220b40c520bb5 (diff)
downloademacs-43ec6efa2b41b43a2e55be16434f64bba644271e.tar.gz
emacs-43ec6efa2b41b43a2e55be16434f64bba644271e.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c9
1 files changed, 3 insertions, 6 deletions
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,
3573 { 3573 {
3574 case FOCUS_IN_EVENT: ignore_event = Qfocus_in; break; 3574 case FOCUS_IN_EVENT: ignore_event = Qfocus_in; break;
3575 case FOCUS_OUT_EVENT: ignore_event = Qfocus_out; break; 3575 case FOCUS_OUT_EVENT: ignore_event = Qfocus_out; break;
3576 case HELP_EVENT: ignore_event = Qhelp; break; 3576 case HELP_EVENT: ignore_event = Qhelp_echo; break;
3577 case ICONIFY_EVENT: ignore_event = Qiconify; break; 3577 case ICONIFY_EVENT: ignore_event = Qiconify_frame; break;
3578 case DEICONIFY_EVENT: ignore_event = Qdeiconify; break; 3578 case DEICONIFY_EVENT: ignore_event = Qmake_frame_visible; break;
3579 case SELECTION_REQUEST_EVENT: ignore_event = Qselection_request; break; 3579 case SELECTION_REQUEST_EVENT: ignore_event = Qselection_request; break;
3580 } 3580 }
3581 3581
@@ -11172,9 +11172,6 @@ syms_of_keyboard (void)
11172 DEFSYM (Qiconify_frame, "iconify-frame"); 11172 DEFSYM (Qiconify_frame, "iconify-frame");
11173 DEFSYM (Qmake_frame_visible, "make-frame-visible"); 11173 DEFSYM (Qmake_frame_visible, "make-frame-visible");
11174 DEFSYM (Qselect_window, "select-window"); 11174 DEFSYM (Qselect_window, "select-window");
11175 DEFSYM (Qhelp, "help");
11176 DEFSYM (Qiconify, "iconify");
11177 DEFSYM (Qdeiconify, "deiconify");
11178 DEFSYM (Qselection_request, "selection-request"); 11175 DEFSYM (Qselection_request, "selection-request");
11179 { 11176 {
11180 int i; 11177 int i;