(make_frame_without_minibuffer): New arg KB.

Require the new frame's minibuffer to be on the same display.

diff --git a/src/frame.c b/src/frame.c
index bac0bbaa6ba55386a8fe68289455a20a93a07854..ad6a9a87c2fe261496dec6335c0ec66e604104d3 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -256,8 +256,9 @@ make_frame (mini_p)
    default (the global minibuffer).  */
 
 struct frame *
-make_frame_without_minibuffer (mini_window)
+make_frame_without_minibuffer (mini_window, kb)
      register Lisp_Object mini_window;
+     KBOARD *kb;
 {
   register struct frame *f;
 
@@ -275,6 +276,11 @@ make_frame_without_minibuffer (mini_window)
       CHECK_LIVE_WINDOW (mini_window, 0);
     }
 
+#ifdef MULTI_KBOARD
+  if (XFRAME (XWINDOW (mini_window)->frame)->kboard != kb)
+    error ("frame and minibuffer must be on the same display");
+#endif
+
   /* Make a frame containing just a root window.  */
   f = make_frame (0);