diff options
| author | Miha Rihtaršič | 2021-07-20 14:36:45 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2021-07-20 14:36:45 +0200 |
| commit | 7edbcb3648e9d08a4ccc291f672f831b4f07eb5c (patch) | |
| tree | 30f6ce7415be55f973b0071d2d957023b9b8c4c7 /src/macros.c | |
| parent | 557c59591cb03729c7ab56719e5ed87a1f06d435 (diff) | |
| download | emacs-7edbcb3648e9d08a4ccc291f672f831b4f07eb5c.tar.gz emacs-7edbcb3648e9d08a4ccc291f672f831b4f07eb5c.zip | |
Quit minibuffers without aborting kmacros
* doc/lispref/commands.texi (Quitting): Document `minibuffer-quit'
(Recursive Editing): Document throwing of function values to `exit'.
* doc/lispref/errors.texi (Standard Errors): Document
`minibuffer-quit'
* lisp/minibuffer.el (minibuffer-quit-recursive-edit): New function.
* lisp/simple.el (minibuffer-error-function): Do not abort keyboard
macro execution if is minibuffer-quit is signaled (bug#48603).
* src/data.c (syms_of_data): New error symbol `minibuffer-quit'
* src/keyboard.c (recursive_edit_1): Implement throwing of function
values to `exit`. In that case, the function will be called without
arguments before returning from the command loop.
(cmd_error):
(Fcommand_error_default_function): Do not abort keyboard macro
execution if minibuffer-quit is signaled.
(command_loop_2): New argument HANDLERS.
* src/macros.c (Fexecute_kbd_macro): Use command_loop_2 instead of
command_loop_1.
* src/minibuf.c (Fabort_minibuffers): Use it.
Diffstat (limited to 'src/macros.c')
| -rw-r--r-- | src/macros.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/macros.c b/src/macros.c index 60d0766a754..0752a5bb6f6 100644 --- a/src/macros.c +++ b/src/macros.c | |||
| @@ -324,7 +324,7 @@ buffer before the macro is executed. */) | |||
| 324 | break; | 324 | break; |
| 325 | } | 325 | } |
| 326 | 326 | ||
| 327 | command_loop_1 (); | 327 | command_loop_2 (list1 (Qminibuffer_quit)); |
| 328 | 328 | ||
| 329 | executing_kbd_macro_iterations = ++success_count; | 329 | executing_kbd_macro_iterations = ++success_count; |
| 330 | 330 | ||