From: Alan Mackenzie <acm@muc.de>
Date: Mon, 23 Nov 2020 15:54:50 +0000 (+0000)
Subject: minibuffer code: restore original frame after using minibuffer-only frame, etc
X-Git-Tag: emacs-28.0.90~5062
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3edaa552491629917489ddd7aaa4829fd3487a4;p=emacs.git

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.
---

diff --git a/src/minibuf.c b/src/minibuf.c
index 464e3018f7d..fc3fd92a880 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -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,