From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 10 Dec 2005 00:38:29 +0000 (+0000)
Subject: (Fx_create_frame): Reinstate previous change.
X-Git-Tag: emacs-pretest-22.0.90~5394
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e358e052160031115249c6ec86e657932a8e053f;p=emacs.git

(Fx_create_frame): Reinstate previous change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 6e3fc3a4a5c..8513de08053 100644
--- 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 06779ca3b07..ee4a7bf3b00 100644
--- 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;