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

Reuse already existing lisp symbols for ignore_event (bug#19547).

Browse source 
* 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.
This commit is contained in:
Thierry Volpiatto 2016-11-28 06:55:14 +01:00
parent d9dd884c7c
commit 43ec6efa2b
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lisp/subr.el
View file

@ -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.

9
src/keyboard.c
View file

@ -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;