From a83d8c9bbe5fbcdeccebfc54d72e1019a951fe52 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 12 Dec 2020 17:32:55 +0200 Subject: [PATCH] Followup to recent changes in keyboard.c * src/keyboard.c (prev_kbd_event): Now defined only if HAVE_X11. * lisp/subr.el (while-no-input-ignore-events): Remove 'buffer-switch': no longer used or defined. (Bug#5803) --- lisp/subr.el | 2 +- src/keyboard.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/subr.el b/lisp/subr.el index c28807f694b..ed235ee1f72 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3964,7 +3964,7 @@ 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-echo iconify-frame - make-frame-visible selection-request buffer-switch)) + 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 560d92c99f3..dbca5be91e4 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -384,11 +384,13 @@ next_kbd_event (union buffered_input_event *ptr) return ptr == kbd_buffer + KBD_BUFFER_SIZE - 1 ? kbd_buffer : ptr + 1; } +#ifdef HAVE_X11 static union buffered_input_event * prev_kbd_event (union buffered_input_event *ptr) { return ptr == kbd_buffer ? kbd_buffer + KBD_BUFFER_SIZE - 1 : ptr - 1; } +#endif /* Like EVENT_START, but assume EVENT is an event. This pacifies gcc -Wnull-dereference, which might otherwise -- 2.39.2