1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-23 04:53:12 -08:00

(enlarge_window): Fix last change.

This commit is contained in:
Eli Zaretskii 2002-02-02 08:18:03 +00:00
parent 764004c810
commit e376db3081
2 changed files with 22 additions and 6 deletions

View file

@ -1,3 +1,7 @@
2002-02-02 Richard M. Stallman <rms@gnu.org>
* window.c (enlarge_window): Fix last change.
2002-02-01 Kim F. Storm <storm@cua.dk>
* xterm.c (x_erase_phys_cursor): Don't erase cursor if cursor row

View file

@ -3525,17 +3525,29 @@ enlarge_window (window, delta, widthflag)
{
/* If trying to grow this window to or beyond size of the parent,
just delete all the sibling windows. */
Lisp_Object tem, next;
Lisp_Object start, tem, next;
tem = XWINDOW (parent)->vchild;
if (NILP (tem))
tem = XWINDOW (parent)->hchild;
start = XWINDOW (parent)->vchild;
if (NILP (start))
start = XWINDOW (parent)->hchild;
/* Delete any siblings that come after WINDOW. */
tem = XWINDOW (window)->next;
while (! NILP (tem))
{
next = XWINDOW (tem)->next;
if (!EQ (tem, window))
delete_window (tem);
delete_window (tem);
tem = next;
}
/* Delete any siblings that come after WINDOW.
Note that if START is not WINDOW, then WINDOW still
Fhas siblings, so WINDOW has not yet replaced its parent. */
tem = start;
while (! EQ (tem, window))
{
next = XWINDOW (tem)->next;
delete_window (tem);
tem = next;
}
}