procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* frame.c (make_frame): Do not set window's buffer to t.

Browse source 
* 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.
This commit is contained in:
Dmitry Antipov 2012-12-07 12:13:49 +04:00
parent ed08365b9e
commit 822995f8b9
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -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.

14
src/frame.c
View file

@ -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);

4
src/window.c
View file

@ -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);