* net/dbus.el (dbus-call-method): Use timeout for `read-event'.

Otherwise, it blocks in batch mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa6887993741c0cc7bb74f296dcb004d7ef62101..1e3908d487a89d16d3771f982af944a56e0045bd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-13  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/dbus.el (dbus-call-method): Use timeout for `read-event'.
+       Otherwise, it blocks in batch mode.
+
 2012-06-13  Juanma Barranquero  <lekktu@gmail.com>
 
        * help-mode.el (bookmark-make-record-default): Declare.

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index c83651b41b521e435d9442882fff23d75aea0372..7d6dcf37a01f20b6451dbd457be996369b6af6eb 100644 (file)
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -269,7 +269,7 @@ object is returned instead of a list containing this single Lisp object.
     ;; 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)))))))