[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108593: * net/dbus.el (dbus-call-method): Use timeout for `read-event'.

[Michael Albinus]

------------------------------------------------------------
revno: 108593
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2012-06-13 13:56:53 +0200
message:
  * net/dbus.el (dbus-call-method): Use timeout for `read-event'.
  Otherwise, it blocks in batch mode.
modified:
  lisp/ChangeLog
  lisp/net/dbus.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-13 11:13:17 +0000
+++ b/lisp/ChangeLog    2012-06-13 11:56:53 +0000
@@ -1,3 +1,8 @@
+2012-06-13  Michael Albinus  <address@hidden>
+
+       * net/dbus.el (dbus-call-method): Use timeout for `read-event'.
+       Otherwise, it blocks in batch mode.
+
 2012-06-13  Juanma Barranquero  <address@hidden>
 
        * help-mode.el (bookmark-make-record-default): Declare.

=== modified file 'lisp/net/dbus.el'
--- a/lisp/net/dbus.el  2012-05-13 09:05:04 +0000
+++ b/lisp/net/dbus.el  2012-06-13 11:56:53 +0000
@@ -269,7 +269,7 @@
     ;; default 25".  Events which are not from D-Bus must be restored.
     (with-timeout ((if timeout (/ timeout 1000.0) 25))
       (while (eq (gethash key dbus-return-values-table :ignore) :ignore)
-       (let ((event (let (unread-command-events) (read-event))))
+       (let ((event (let (unread-command-events) (read-event nil nil 0.1))))
          (when (and event (not (ignore-errors (dbus-check-event event))))
            (setq unread-command-events
                  (append unread-command-events (list event)))))))