From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 15 Aug 2009 18:31:49 +0000 (+0000)
Subject: * keyboard.c (readable_events): Call xd_pending_messages.
X-Git-Tag: emacs-pretest-23.1.90~1845
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=485db0ba8618f888187586963d73ed2e36ae585d;p=emacs.git

* keyboard.c (readable_events): Call xd_pending_messages.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index e4162842008..11c371b6cca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-15  Michael Albinus  <michael.albinus@gmx.de>
+
+	* dbusbind.c (xd_get_dispatch_status, xd_pending_messages): New
+	functions.
+
+	* lisp.h (xd_pending_messages): Declare.
+
+	* keyboard.c (readable_events): Call xd_pending_messages.
+
 2009-08-15  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xdisp.c (pop_it): Don't pop into a display vector (Bug#4131).
diff --git a/src/keyboard.c b/src/keyboard.c
index a49c6465f41..9512e4ac979 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3660,6 +3660,12 @@ static int
 readable_events (flags)
      int flags;
 {
+#ifdef HAVE_DBUS
+  /* Check whether a D-Bus message has arrived.  */
+  if (xd_pending_messages () > 0)
+    return 1;
+#endif /* HAVE_DBUS */
+
   if (flags & READABLE_EVENTS_DO_TIMERS_NOW)
     timer_check (1);
 
@@ -6982,7 +6988,7 @@ gobble_input (expected)
      int expected;
 {
 #ifdef HAVE_DBUS
-  /* Check whether a D-Bus message has arrived.  */
+  /* Read D-Bus messages.  */
   xd_read_queued_messages ();
 #endif /* HAVE_DBUS */
 
@@ -7338,7 +7344,7 @@ tty_read_avail_input (struct terminal *terminal,
     {
       struct coding_system *coding = TERMINAL_KEYBOARD_CODING (terminal);
       int from;
-      
+
       /* Decode the key sequence except for those with meta
 	 modifiers.  */
       for (i = from = 0; ; i++)