(Fx_create_frame): Reinstate previous change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6e3fc3a4a5c3384aeb858395b9e70a20b2f343a2..8513de08053007fb393cee8ce34c343dabfe6023 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-09  Richard M. Stallman  <rms@gnu.org>
+
+       * xfns.c (Fx_create_frame): Reinstate previous change.
+
 2005-12-09  Eli Zaretskii  <eliz@gnu.org>
 
        * w32fns.c (w32_abort) [__GNUC__]: Add instructions for attaching

diff --git a/src/xfns.c b/src/xfns.c
index 06779ca3b07aecc4b7f5a35e15b6f9723889cccd..ee4a7bf3b004d1eb0dbc42d2e43ef26f1c421841 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3373,16 +3373,12 @@ This function is an internal primitive--use `make-frame' instead.  */)
       UNBLOCK_INPUT;
     }
 
-#if 0 /* This is incorrect because `default-minibuffer-frame'
-        should only be set automatically to a minibuffer-only frame.  */
-
   /* 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;
-#endif
 
   UNGCPRO;