Commit 682cefaf authored by Michael Albinus's avatar Michael Albinus

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

Otherwise, it blocks in batch mode.
parent 773e1f08
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.
......
......@@ -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)))))))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment