# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 869541025 0
# Node ID 1ff8b0bca025bf3eff2d7781d6051460cd5a69c7
# Parent  0d699fd569cb6105f10811fde165f627a9b8ccd3
(choose_minibuf_frame_1): New function.
(read_minibuf): Make an unwind protect to run that.
(read_minibuf_unwind): Don't call choose_minibuf_frame here.

diff -r 0d699fd569cb -r 1ff8b0bca025 src/minibuf.c
--- a/src/minibuf.c	Tue Jul 22 00:07:55 1997 +0000
+++ b/src/minibuf.c	Tue Jul 22 03:10:25 1997 +0000
@@ -148,6 +148,14 @@
   }
 }
 
+Lisp_Object
+choose_minibuf_frame_1 (ignore)
+     Lisp_Object ignore;
+{
+  choose_minibuf_frame ();
+  return Qnil;
+}
+
 DEFUN ("set-minibuffer-window", Fset_minibuffer_window,
        Sset_minibuffer_window, 1, 1, 0,
   "Specify which minibuffer window to use for the minibuffer.\n\
@@ -234,6 +242,8 @@
 
   choose_minibuf_frame ();
 
+  record_unwind_protect (choose_minibuf_frame_1, Qnil);
+
   record_unwind_protect (Fset_window_configuration,
 			 Fcurrent_window_configuration (Qnil));
 
@@ -539,10 +549,6 @@
     unbind_to (count, Qnil);
   }
 
-  /* Make the minibuffer follow the selected frame
-     (in case we are exiting a recursive minibuffer).  */
-  choose_minibuf_frame ();
-
   /* Make sure minibuffer window is erased, not ignored.  */
   windows_or_buffers_changed++;
   XSETFASTINT (XWINDOW (window)->last_modified, 0);