[Emacs-diffs] emacs-24 r117247: Fix a regression bug in D-Bus event handling.

[Michael Albinus]

------------------------------------------------------------
revno: 117247
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Sun 2014-06-15 14:15:25 +0200
message:
  Fix a regression bug in D-Bus event handling.
  
  * net/dbus.el (dbus-call-method): Push only non D-Bus events into
  `unread-command-events'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/dbus.el               dbus.el-20091113204419-o5vbwnq5f7feedwu-7962

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-14 23:54:39 +0000
+++ b/lisp/ChangeLog    2014-06-15 12:15:25 +0000
@@ -1,3 +1,8 @@
+2014-06-15  Michael Albinus  <address@hidden>
+
+       * net/dbus.el (dbus-call-method): Push only non D-Bus events into
+       `unread-command-events'.
+
 2014-06-14  Glenn Morris  <address@hidden>
 
        * progmodes/cc-langs.el: Require cl-lib.  (Bug#17463)

=== modified file 'lisp/net/dbus.el'
--- a/lisp/net/dbus.el  2014-05-16 13:11:09 +0000
+++ b/lisp/net/dbus.el  2014-06-15 12:15:25 +0000
@@ -318,10 +318,12 @@
              (while (eq (car result) :pending)
                (let ((event (let ((inhibit-redisplay t) unread-command-events)
                               (read-event nil nil check-interval))))
-                 (when event
-                   (setf unread-command-events
-                         (nconc unread-command-events
-                                (cons event nil))))
+                (when event
+                  (if (ignore-errors (dbus-check-event event))
+                      (setf result (gethash key dbus-return-values-table))
+                    (setf unread-command-events
+                          (nconc unread-command-events
+                                 (cons event nil)))))
                  (when (< check-interval 1)
                    (setf check-interval (* check-interval 1.05))))))
            (when (eq (car result) :error)