diff options
| author | Michael Albinus | 2013-05-27 14:41:17 +0200 |
|---|---|---|
| committer | Michael Albinus | 2013-05-27 14:41:17 +0200 |
| commit | dde84790b7308d745d1cf635e1dc43c834d1b7bf (patch) | |
| tree | 9ea90bd487cee6db9822650fdc0d396cbee0e312 | |
| parent | c31effdbdc7af05ca079cb2596590e0177fa74cb (diff) | |
| download | emacs-dde84790b7308d745d1cf635e1dc43c834d1b7bf.tar.gz emacs-dde84790b7308d745d1cf635e1dc43c834d1b7bf.zip | |
* net/dbus.el (dbus-call-method): Let-bind `inhibit-redisplay'
when reading the events; the buffer layout shall not be changed.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/dbus.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1163711a878..05360ad63da 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-05-27 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/dbus.el (dbus-call-method): Let-bind `inhibit-redisplay' | ||
| 4 | when reading the events; the buffer layout shall not be changed. | ||
| 5 | |||
| 1 | 2013-05-27 Leo Liu <sdl.web@gmail.com> | 6 | 2013-05-27 Leo Liu <sdl.web@gmail.com> |
| 2 | 7 | ||
| 3 | * progmodes/octave.el (inferior-octave-directory-tracker-resync): | 8 | * progmodes/octave.el (inferior-octave-directory-tracker-resync): |
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index cf2cd0f311b..94a906122fe 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el | |||
| @@ -270,7 +270,8 @@ object is returned instead of a list containing this single Lisp object. | |||
| 270 | ;; default 25". Events which are not from D-Bus must be restored. | 270 | ;; default 25". Events which are not from D-Bus must be restored. |
| 271 | (with-timeout ((if timeout (/ timeout 1000.0) 25)) | 271 | (with-timeout ((if timeout (/ timeout 1000.0) 25)) |
| 272 | (while (eq (gethash key dbus-return-values-table :ignore) :ignore) | 272 | (while (eq (gethash key dbus-return-values-table :ignore) :ignore) |
| 273 | (let ((event (let (unread-command-events) (read-event nil nil 0.1)))) | 273 | (let ((event (let ((inhibit-redisplay t) unread-command-events) |
| 274 | (read-event nil nil 0.1)))) | ||
| 274 | (when (and event (not (ignore-errors (dbus-check-event event)))) | 275 | (when (and event (not (ignore-errors (dbus-check-event event)))) |
| 275 | (setq unread-command-events | 276 | (setq unread-command-events |
| 276 | (append unread-command-events (list event))))))) | 277 | (append unread-command-events (list event))))))) |