(make_frame_without_minibuffer): Don't change the

mini_window's buffer if it already displays a minibuffer.

diff --git a/src/frame.c b/src/frame.c
index 846c142248efca4105fb5fc8346aa1ec743000c7..d9656c37fad89c37804710d63208318e894aa493 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -404,12 +404,16 @@ make_frame_without_minibuffer (mini_window, kb, display)
        }
       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;
 }