minibuffer code: restore original frame after using minibuffer-only frame, etc

* src/minibuf.c (read_minibuf): In the record_unwind_protect for the second
restore_window_configuration (separate minibuffer frame case) arrange for the
future switching back to the original frame by Fset_window_configuration.
This commit is contained in:
Alan Mackenzie 2020-11-23 15:54:50 +00:00
parent d645b6f9ac
commit c3edaa5524

View file

@ -508,7 +508,10 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
mini_frame = WINDOW_FRAME (XWINDOW (minibuf_window));
if (!EQ (mini_frame, selected_frame))
record_unwind_protect (restore_window_configuration,
Fcons (Qt,
Fcons (/* Arrange for the frame later to be
switched back to the calling
frame. */
Qnil,
Fcurrent_window_configuration (mini_frame)));
/* If the minibuffer is on an iconified or invisible frame,