diff --git a/src/ChangeLog b/src/ChangeLog
index 5c92d94ee64a06a205989324a0d73cddc76cc6b9..a8be140ca0eab2ce463fcebb4f00e9f808f5d1d5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-07  Dmitry Antipov  <dmantipov@yandex.ru>
+
+	* frame.c (make_frame): Do not set window's buffer to t.
+	* window.c (Fsplit_window_internal): Likewise.  Previously it was
+	used to indicate that the window is being set up.  Now we use
+	set_window_buffer for all new windows, so the condition in ...
+	(Fset_window_buffer): ... is always true and can be removed.
+
 2012-12-07  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	Convenient macro to check whether the buffer is hidden.
diff --git a/src/frame.c b/src/frame.c
index 87b21d0a41c9b6c4959b8579032d106b1cbc6d1f..5cefad6ca4625aff7a5731dcf13e8d990af29b20 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -348,7 +348,6 @@ make_frame (int mini_p)
   {
     Lisp_Object buf = Fcurrent_buffer ();
 
-    wset_buffer (XWINDOW (root_window), Qt);
     /* If current buffer is hidden, try to find another one.  */
     if (BUFFER_HIDDEN_P (XBUFFER (buf)))
       buf = other_buffer_safely (buf);
@@ -364,14 +363,11 @@ make_frame (int mini_p)
   }
 
   if (mini_p)
-    {
-      wset_buffer (XWINDOW (mini_window), Qt);
-      set_window_buffer (mini_window,
-			 (NILP (Vminibuffer_list)
-			  ? get_minibuffer (0)
-			  : Fcar (Vminibuffer_list)),
-			 0, 0);
-    }
+    set_window_buffer (mini_window,
+		       (NILP (Vminibuffer_list)
+			? get_minibuffer (0)
+			: Fcar (Vminibuffer_list)),
+		       0, 0);
 
   fset_root_window (f, root_window);
   fset_selected_window (f, root_window);
diff --git a/src/window.c b/src/window.c
index 9f3474fcd53049f2171d32f67a6508470ff5d636..d7c2e8b236ecc25a8f6c3da554e84d1640e91770 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3250,8 +3250,7 @@ This function runs `window-scroll-functions' before running
   tem = w->buffer;
   if (NILP (tem))
     error ("Window is deleted");
-  else if (!EQ (tem, Qt))
-    /* w->buffer is t when the window is first being set up.  */
+  else
     {
       if (!EQ (tem, buffer))
 	{
@@ -3914,7 +3913,6 @@ set correctly.  See the code of `split-window' for how this is done.  */)
       wset_next (o, new);
     }
 
-  wset_buffer (n, Qt);
   wset_window_end_valid (n, Qnil);
   memset (&n->last_cursor, 0, sizeof n->last_cursor);