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.

(cherry picked from commit d444390ec569afee35628e112a8d96d11f40175c)

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 77b334e704e7bfebd04fe761a7f15d78d7efa71d..46f85daba2447e58a2a93c3de60a06c1ceca4ab8 100644 (file)
--- 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

diff --git a/lisp/subr.el b/lisp/subr.el
index 4d93e7ed64015ffabd259379fb4903ca25bc24e9..66c7a929a8a9c81683374ace283f0073d69bdd83 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3558,11 +3558,6 @@ causes it to evaluate `help-form' and display the result."
                 (help-form-show)))
           ((memq char chars)
            (setq done t))
-          ((and executing-kbd-macro (= char -1))
-           ;; read-event returns -1 if we are in a kbd macro and
-           ;; there are no more events in the macro.  Attempt to
-           ;; get an event interactively.
-           (setq executing-kbd-macro nil))
           ((not inhibit-keyboard-quit)
            (cond
             ((and (null esc-flag) (eq char ?\e))