auto upstream

3 files changed, 14 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5c92d94ee64..a8be140ca0e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
 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.
         * buffer.h (BUFFER_HIDDEN_P): New macro.
         * frame.c (make_frame): Use it.  Adjust comment.
diff --git a/src/frame.c b/src/frame.c
index 87b21d0a41c..5cefad6ca46 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 4c798ad4570..0340044ca21 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3251,8 +3251,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))
         {
@@ -3915,7 +3914,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);