diff options
| author | Tim Ruffing <crypto@timruffing.de> | 2023-12-27 14:32:09 +0100 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2024-03-10 10:40:16 -0400 |
| commit | d444390ec569afee35628e112a8d96d11f40175c (patch) | |
| tree | 6b4d76307ccff8d4c4903567f16c2755d54dd3c1 /lisp/net | |
| parent | 6f46dd516b84ad7d59b49c2e9e3fc1a2d4ef4d1c (diff) | |
| download | emacs-d444390ec569afee35628e112a8d96d11f40175c.tar.gz | |
Remove workarounds for solved 'read-event' bug
* lisp/subr.el (read-char-choice-with-read-key):
* lisp/net/dbus.el (dbus-call-method):
Remove workarounds for the bug fixed in the previous commit
ac82baea1c41ec974ad49f2861ae6c06bda2b4ed, where 'read-event',
'read-char' and 'read-char-exclusively' could return wrongly -1.
In the case of lisp/dbus.el, this reverts commit
7177393826c73c87ffe9b428f0e5edae244d7a98.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/dbus.el | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 77b334e704e..46f85daba24 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -371,11 +371,7 @@ object is returned instead of a list containing this single Lisp object. (apply #'dbus-message-internal dbus-message-type-method-call bus service path interface method #'dbus-call-method-handler args)) - (result (unless executing-kbd-macro (cons :pending nil)))) - - ;; While executing a keyboard macro, we run into an infinite loop, - ;; receiving the event -1. So we don't try to get the result. - ;; (Bug#62018) + (result (cons :pending nil))) ;; Wait until `dbus-call-method-handler' has put the result into ;; `dbus-return-values-table'. If no timeout is given, use the |