From: Allen Li <vianchielfaura@gmail.com>
Date: Sat, 30 Sep 2017 13:46:48 +0000 (+0300)
Subject: Exit macro definition on undefined keys
X-Git-Tag: emacs-26.0.90~87
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f17289459527da254d02e516e944c89d3c505377;p=emacs.git

Exit macro definition on undefined keys

* lisp/subr.el (undefined): Error out of kmacro definition, if any.
(Bug#28008)

Copyright-paperwork-exempt: yes
---

diff --git a/lisp/subr.el b/lisp/subr.el
index cf15ec287ff..64479a4b5b7 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -785,8 +785,9 @@ This is the same format used for saving keyboard macros (see
   "Beep to tell the user this binding is undefined."
   (interactive)
   (ding)
-  (message "%s is undefined" (key-description (this-single-command-keys)))
-  (setq defining-kbd-macro nil)
+  (if defining-kbd-macro
+      (error "%s is undefined" (key-description (this-single-command-keys)))
+    (message "%s is undefined" (key-description (this-single-command-keys))))
   (force-mode-line-update)
   ;; If this is a down-mouse event, don't reset prefix-arg;
   ;; pass it to the command run by the up event.