# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 829289226 0
# Node ID c74ce6421d0481123c12b53c364d92561865ccd2
# Parent  90dc2b5d32c4cc579b3459a9dc79c77174ca6771
(make_frame_without_minibuffer): Don't change the
mini_window's buffer if it already displays a minibuffer.

diff -r 90dc2b5d32c4 -r c74ce6421d04 src/frame.c
--- a/src/frame.c	Fri Apr 12 06:06:34 1996 +0000
+++ b/src/frame.c	Fri Apr 12 06:07:06 1996 +0000
@@ -404,12 +404,16 @@
 	}
       mini_window = XFRAME (kb->Vdefault_minibuffer_frame)->minibuffer_window;
     }
-  /* Install the chosen minibuffer window, with proper buffer.  */
+
   f->minibuffer_window = mini_window;
-  Fset_window_buffer (mini_window,
-		      (NILP (Vminibuffer_list)
-		       ? get_minibuffer (0)
-		       : Fcar (Vminibuffer_list)));
+
+  /* Make the chosen minibuffer window display the proper minibuffer,
+     unless it is already showing a minibuffer.  */
+  if (NILP (Fmemq (XWINDOW (mini_window)->buffer, Vminibuffer_list)))
+    Fset_window_buffer (mini_window,
+			(NILP (Vminibuffer_list)
+			 ? get_minibuffer (0)
+			 : Fcar (Vminibuffer_list)));
   return f;
 }