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

Fix think-o in previous patch

Browse source 
* src/window.c (count_windows, get_leaf_windows):
Don't optimize count_windows incorrectly.
This commit is contained in:
Paul Eggert 2015-04-14 00:26:18 -07:00 • committed by Paul Eggert
parent b80c5ebc4f
commit 7744cc7e95
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/window.c
View file

@ -6527,11 +6527,17 @@ delete_all_child_windows (Lisp_Object window)
static ptrdiff_t
count_windows (struct window *window)
{
return get_leaf_windows (window, NULL, 0);
ptrdiff_t count = 1;
if (!NILP (window->next))
count += count_windows (XWINDOW (window->next));
if (WINDOWP (window->contents))
count += count_windows (XWINDOW (window->contents));
return count;
}
/* If vector FLAT is non-null, fill it with leaf windows under W,
starting at index I. Value is last index + 1. */
/* Fill vector FLAT with leaf windows under W, starting at index I.
Value is last index + 1. */
static ptrdiff_t
get_leaf_windows (struct window *w, struct window **flat, ptrdiff_t i)
{
@ -6540,11 +6546,7 @@ get_leaf_windows (struct window *w, struct window **flat, ptrdiff_t i)
if (WINDOWP (w->contents))
i = get_leaf_windows (XWINDOW (w->contents), flat, i);
else
{
if (flat)
flat[i] = w;
i++;
}
flat[i++] = w;
w = NILP (w->next) ? 0 : XWINDOW (w->next);
}