diff options
| author | Alan Mackenzie <acm@muc.de> | 2020-11-19 10:31:50 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2020-11-19 10:31:50 +0000 |
| commit | 6e469709c550ba18d9d5a34f6bb89908472f0eb2 (patch) | |
| tree | 7a785ff8f1deb6a7a2704e8a0bf6331dc6e0b70d /src/keyboard.c | |
| parent | cb2e34b49332cf2664de6fc4a8a79da5965298ed (diff) | |
| download | emacs-6e469709c550ba18d9d5a34f6bb89908472f0eb2.tar.gz emacs-6e469709c550ba18d9d5a34f6bb89908472f0eb2.tar.bz2 emacs-6e469709c550ba18d9d5a34f6bb89908472f0eb2.zip | |
In attempted recursive minibuffer use, display error message in correct frame
This was problematic when minibuffer-follows-selected-frame was non-nil.
Introduce a new parameter DONT-SET-FRAME to set-window-configuration.
* doc/lispref/windows.texi (Window Configurations): Describe the new &optional
parameter to set-window-configuration.
* etc/NEWS (Lisp Changes): Note the new parameter to set-window-configuration.
* src/keyboard.c (read_char_help_form_unwind): Add a new Qnil argument to the
call of Fset_window_configuration.
* src/minibuf.c (read_minibuf): Cons up a Qt with the window configuration in
the argument to record_unwind_protect for the window configuration (twice).
* src/window.c (Fset_window_configuration): Add the new &optional parameter
and document it in the doc string. At the final do_switch_frame operation,
restore the original frame when DONT-SET-FRAME is non-nil.
(restore_window_configuration): Handle the new parameter when the supplied
argument is a cons.
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 49a0a8bd236..1579c007ecf 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -2122,7 +2122,7 @@ read_char_help_form_unwind (void) Lisp_Object window_config = XCAR (help_form_saved_window_configs); help_form_saved_window_configs = XCDR (help_form_saved_window_configs); if (!NILP (window_config)) - Fset_window_configuration (window_config); + Fset_window_configuration (window_config, Qnil); } #define STOP_POLLING \ |