[Emacs-diffs] /srv/bzr/emacs/trunk r111143: * frame.c (make_frame): Do not set window's buffer to t.

[Dmitry Antipov]

------------------------------------------------------------
revno: 111143
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Fri 2012-12-07 12:13:49 +0400
message:
  * 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.
modified:
  src/ChangeLog
  src/frame.c
  src/window.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-12-07 07:16:32 +0000
+++ b/src/ChangeLog     2012-12-07 08:13:49 +0000
@@ -1,5 +1,13 @@
 2012-12-07  Dmitry Antipov  <address@hidden>
 
+       * 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  <address@hidden>
+
        Convenient macro to check whether the buffer is hidden.
        * buffer.h (BUFFER_HIDDEN_P): New macro.
        * frame.c (make_frame): Use it.  Adjust comment.

=== modified file 'src/frame.c'
--- a/src/frame.c       2012-12-07 07:16:32 +0000
+++ b/src/frame.c       2012-12-07 08:13:49 +0000
@@ -348,7 +348,6 @@
   {
     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 @@
   }
 
   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);

=== modified file 'src/window.c'
--- a/src/window.c      2012-11-12 04:00:55 +0000
+++ b/src/window.c      2012-12-07 08:13:49 +0000
@@ -3250,8 +3250,7 @@
   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 @@
       wset_next (o, new);
     }
 
-  wset_buffer (n, Qt);
   wset_window_end_valid (n, Qnil);
   memset (&n->last_cursor, 0, sizeof n->last_cursor);