mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-02 21:52:04 -08:00
Code Issues Projects Releases Wiki Activity

Allow configuring which event throw-on-input should ignore (bug#19547).

Browse source 
* src/keyboard.c (kbd_buffer_store_buffered_event):
Translate event to corresponding symbol from `while-no-input-ignore-events`
and check them with Fmemq.
(syms_of_keyboard): Declare new lisp variable `while-no-input-ignore-events`
and its symbols.

* lisp/subr.el (while-no-input-ignore-events): Add default values.

* doc/lispref/commands.texi (Event Input Misc):
Document while-no-input-ignore-events.
* etc/NEWS: Same.
This commit is contained in:
Thierry Volpiatto 2016-11-27 09:31:58 +01:00
parent 416adda385
commit d9dd884c7c
4 changed files with 36 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/lispref/commands.texi
View file

@ -2917,6 +2917,12 @@ like this:
@end example
@end defmac
@defvar while-no-input-ignore-events
This variable allow setting which special events @code{while-no-input}
should ignore. It is a list of symbols.
@end defvar
@defun discard-input
@cindex flushing input
@cindex discarding input

4
etc/NEWS
View file

@ -610,6 +610,10 @@ function 'check-declare-errmsg' has been removed.
* Lisp Changes in Emacs 26.1
** New variable 'while-no-input-ignore-events' which allow
setting which special events 'while-no-input' should ignore.
It is a list of symbols.
** New function 'undo-amalgamate-change-group' to get rid of
undo-boundaries between two states.

4
lisp/subr.el
View file

@ -3335,6 +3335,10 @@ is allowed once again. (Immediately, if `inhibit-quit' is nil.)"
;; that intends to handle the quit signal next time.
(eval '(ignore 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))
(defmacro while-no-input (&rest body)
"Execute BODY only as long as there's no pending input.
If input arrives, that ends the execution of BODY,

27
src/keyboard.c
View file

@ -3567,14 +3567,22 @@ kbd_buffer_store_buffered_event (union buffered_input_event *event,
#endif /* subprocesses */
}
Lisp_Object ignore_event = Qnil;
switch (event->kind)
{
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 SELECTION_REQUEST_EVENT: ignore_event = Qselection_request; break;
}
/* If we're inside while-no-input, and this event qualifies
as input, set quit-flag to cause an interrupt. */
if (!NILP (Vthrow_on_input)
&& event->kind != FOCUS_IN_EVENT
&& event->kind != FOCUS_OUT_EVENT
&& event->kind != HELP_EVENT
&& event->kind != ICONIFY_EVENT
&& event->kind != DEICONIFY_EVENT)
&& !NILP (Fmemq (ignore_event, Vwhile_no_input_ignore_events)))
{
Vquit_flag = Vthrow_on_input;
/* If we're inside a function that wants immediate quits,
@ -11164,6 +11172,10 @@ 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;
@ -11822,6 +11834,11 @@ signals. */);
/* Create the initial keyboard. Qt means 'unset'. */
initial_kboard = allocate_kboard (Qt);
DEFVAR_LISP ("while-no-input-ignore-events",
Vwhile_no_input_ignore_events,
doc: /* Ignored events from while-no-input. */);
Vwhile_no_input_ignore_events = Qnil;
}
void