Ignore BUFFER_SWITCH_EVENT events for the purposes of input-pending-p.

 src/keyboard.c (readable_events): When FLAGS include
 READABLE_EVENTS_FILTER_EVENTS, ignore BUFFER_SWITCH_EVENT events.
 This avoids returning non-nil from input-pending-p when only such
 events are in the queue.

Fixes: debbugs:18856

diff --git a/src/ChangeLog b/src/ChangeLog
index 0ddc26595120654b95c12a3da1be3e5b19483634..d2cfa0dbfc3aa3ba6cb13e170be7a5b224e22d51 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2014-11-01  Eli Zaretskii  <eliz@gnu.org>
+
+       * keyboard.c (readable_events): When FLAGS include
+       READABLE_EVENTS_FILTER_EVENTS, ignore BUFFER_SWITCH_EVENT events.
+       This avoids returning non-nil from input-pending-p when only such
+       events are in the queue.  (Bug#18856)
+
 2014-11-01  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsselect.m (QCLIPBOARD, QSECONDARY, QTEXT, QFILE_NAME)

diff --git a/src/keyboard.c b/src/keyboard.c
index 32d14ab076066e293168db81c10b141eaa1305af..e16ee51ee0e72b790b54ffa9baa4020ebf378472 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3495,7 +3495,8 @@ readable_events (int flags)
                       && event->part == scroll_bar_handle
                       && event->modifiers == 0)
 #endif
-                 )
+                 && !((flags & READABLE_EVENTS_FILTER_EVENTS)
+                      && event->kind == BUFFER_SWITCH_EVENT))
                return 1;
              event++;
               if (event == kbd_buffer + KBD_BUFFER_SIZE)