master d80552d 3/4: Allow kmacros to end with C-g in minibuffer

[Lars Ingebrigtsen]

branch: master
commit d80552df71e2ffe9123689ce5c4a268098a34d88
Author: Miha Rihtaršič <miha@kamnitnik.top>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Allow kmacros to end with C-g in minibuffer
    
    * src/keyboard.c (cmd_error): If a command causes a minibuffer-quit
    condition, record its key in a keyboard macro (bug#48603).
---
 src/keyboard.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/keyboard.c b/src/keyboard.c
index f6139b3..4b0e4a1 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -951,6 +951,10 @@ cmd_error (Lisp_Object data)
       Vexecuting_kbd_macro = Qnil;
       executing_kbd_macro = Qnil;
     }
+  else if (!NILP (KVAR (current_kboard, defining_kbd_macro)))
+    /* An `M-x' command that signals a `minibuffer-quit' condition
+       that's part of a kbd macro.  */
+    finalize_kbd_macro_chars ();
 
   specbind (Qstandard_output, Qt);
   specbind (Qstandard_input, Qt);