2 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2d6ffdef092..4fa4093631f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-07  L$,1 q(Brentey K,Aa(Broly  <lorentey@elte.hu>
+
+        * xfns.c (Fx_create_frame): Initialize Vdefault_minibuffer_frame,
+        when needed.
+
 2005-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * minibuf.c (keys_of_minibuf): Just unbind SPC in
diff --git a/src/xfns.c b/src/xfns.c
index e471b13f403..ee4a7bf3b00 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3373,6 +3373,13 @@ This function is an internal primitive--use `make-frame' instead.  */)
       UNBLOCK_INPUT;
     }
 
+  /* Initialize `default-minibuffer-frame' in case this is the first
+     frame on this display device.  */
+  if (FRAME_HAS_MINIBUF_P (f)
+      && (!FRAMEP (kb->Vdefault_minibuffer_frame)
+          || !FRAME_LIVE_P (XFRAME (kb->Vdefault_minibuffer_frame))))
+    kb->Vdefault_minibuffer_frame = frame;
+
   UNGCPRO;
 
   /* Make sure windows on this frame appear in calls to next-window