summaryrefslogtreecommitdiff
path: root/lisp/net/dbus.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2012-06-13 13:56:53 +0200
committerMichael Albinus <michael.albinus@gmx.de>2012-06-13 13:56:53 +0200
commit682cefaf0c2f61d8d83c3628ae3b0da880771dcf (patch)
tree338d1e4ffa2d91159dbc4533f705339d4a5bdd8f /lisp/net/dbus.el
parent773e1f087264966e61d4364520452822c6d763c4 (diff)
downloademacs-682cefaf0c2f61d8d83c3628ae3b0da880771dcf.tar.gz
* net/dbus.el (dbus-call-method): Use timeout for `read-event'.
Otherwise, it blocks in batch mode.
Diffstat (limited to 'lisp/net/dbus.el')
-rw-r--r--lisp/net/dbus.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index c83651b41b5..7d6dcf37a01 100644
--- 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)))))))