(choose_minibuf_frame): Moved here from frame.c.

diff --git a/src/minibuf.c b/src/minibuf.c
index fa20bbca9c97032e6f1d9406aa9298206c0d63ea..fc8e2ef506115eb7ceaaf71d23f80b1f6177e3b7 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -102,6 +102,27 @@ extern Lisp_Object Vminibuf_scroll_window;
 
 extern Lisp_Object Voverriding_local_map;
 \f
+/* Put minibuf on currently selected frame's minibuffer.
+   We do this whenever the user starts a new minibuffer
+   or when a minibuffer exits.  */
+
+void
+choose_minibuf_frame ()
+{
+  if (selected_frame != 0
+      && !EQ (minibuf_window, selected_frame->minibuffer_window))
+    {
+      /* I don't think that any frames may validly have a null minibuffer
+        window anymore.  */
+      if (NILP (selected_frame->minibuffer_window))
+       abort ();
+
+      Fset_window_buffer (selected_frame->minibuffer_window,
+                         XWINDOW (minibuf_window)->buffer);
+      minibuf_window = selected_frame->minibuffer_window;
+    }
+}
+\f
 /* Actual minibuffer invocation. */
 
 void read_minibuf_unwind ();