aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiha Rihtaršič2021-09-08 09:40:28 +0200
committerLars Ingebrigtsen2021-09-08 09:40:28 +0200
commitd80552df71e2ffe9123689ce5c4a268098a34d88 (patch)
tree1ba889492276d8ff14d8a2cad81597643f5b2b80 /src
parentf12df3b5a03dcb9b33bb1e3796b8402e8c125435 (diff)
downloademacs-d80552df71e2ffe9123689ce5c4a268098a34d88.tar.gz
emacs-d80552df71e2ffe9123689ce5c4a268098a34d88.zip
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).
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index f6139b30e7e..4b0e4a1f772 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -951,6 +951,10 @@ cmd_error (Lisp_Object data)
951 Vexecuting_kbd_macro = Qnil; 951 Vexecuting_kbd_macro = Qnil;
952 executing_kbd_macro = Qnil; 952 executing_kbd_macro = Qnil;
953 } 953 }
954 else if (!NILP (KVAR (current_kboard, defining_kbd_macro)))
955 /* An `M-x' command that signals a `minibuffer-quit' condition
956 that's part of a kbd macro. */
957 finalize_kbd_macro_chars ();
954 958
955 specbind (Qstandard_output, Qt); 959 specbind (Qstandard_output, Qt);
956 specbind (Qstandard_input, Qt); 960 specbind (Qstandard_input, Qt);