# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 806313021 0
# Node ID 071cf90b866a902a85eb794d7eeb4d40e512f371
# Parent  55241c80f44853269dcdd9859d0141c3edb18392
(do_switch_frame): Don't call choose_minibuffer_frame.
(choose_minibuf_frame): Choose frame regardless of minibuffer level.

diff -r 55241c80f448 -r 071cf90b866a src/frame.c
--- a/src/frame.c	Fri Jul 21 07:49:19 1995 +0000
+++ b/src/frame.c	Fri Jul 21 07:50:21 1995 +0000
@@ -488,7 +488,6 @@
     last_nonminibuf_frame = selected_frame;
 
   Fselect_window (XFRAME (frame)->selected_window);
-  choose_minibuf_frame ();
 
   /* We want to make sure that the next event generates a frame-switch
      event to the appropriate frame.  This seems kludgy to me, but
@@ -1875,13 +1874,13 @@
 }
 
 
+/* Put minibuf on currently selected frame's minibuffer.
+   We do this whenever the user starts a new minibuffer
+   or when a minibuffer exits.  */
+
 choose_minibuf_frame ()
 {
-  /* For lowest-level minibuf, put it on currently selected frame
-     if frame has a minibuffer.  */
-
-  if (minibuf_level == 0
-      && selected_frame != 0
+  if (selected_frame != 0
       && !EQ (minibuf_window, selected_frame->minibuffer_window))
     {
       /* I don't think that any frames may validly have a null minibuffer