[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/window.c
From: |
Richard M. Stallman |
Subject: |
[Emacs-diffs] Changes to emacs/src/window.c |
Date: |
Thu, 17 Jan 2002 22:51:33 -0500 |
Index: emacs/src/window.c
diff -c emacs/src/window.c:1.397 emacs/src/window.c:1.398
*** emacs/src/window.c:1.397 Tue Jan 8 00:41:37 2002
--- emacs/src/window.c Thu Jan 17 22:50:15 2002
***************
*** 3543,3553 ****
register int delta1;
register int opht = (*sizefun) (parent);
- /* If trying to grow this window to or beyond size of the parent,
- make delta1 so big that, on shrinking back down,
- all the siblings end up with less than one line and are deleted. */
if (opht <= XINT (*sizep) + delta)
! delta1 = opht * opht * 2;
else
{
/* Otherwise, make delta1 just right so that if we add
--- 3543,3566 ----
register int delta1;
register int opht = (*sizefun) (parent);
if (opht <= XINT (*sizep) + delta)
! {
! /* If trying to grow this window to or beyond size of the parent,
! just delete all the sibling windows. */
! Lisp_Object tem, next;
!
! tem = XWINDOW (parent)->vchild;
! if (NILP (tem))
! tem = XWINDOW (parent)->hchild;
!
! while (! NILP (tem))
! {
! next = XWINDOW (tem)->next;
! if (!EQ (tem, window))
! delete_window (tem);
! tem = next;
! }
! }
else
{
/* Otherwise, make delta1 just right so that if we add
***************
*** 3590,3608 ****
++n;
delta1 = n * delta;
- }
! /* Add delta1 lines or columns to this window, and to the parent,
! keeping things consistent while not affecting siblings. */
! XSETINT (CURSIZE (parent), opht + delta1);
! (*setsizefun) (window, XINT (*sizep) + delta1, 0);
!
! /* Squeeze out delta1 lines or columns from our parent,
! shriking this window and siblings proportionately.
! This brings parent back to correct size.
! Delta1 was calculated so this makes this window the desired size,
! taking it all out of the siblings. */
! (*setsizefun) (parent, opht, 0);
}
XSETFASTINT (p->last_modified, 0);
--- 3603,3622 ----
++n;
delta1 = n * delta;
! /* Add delta1 lines or columns to this window, and to the parent,
! keeping things consistent while not affecting siblings. */
! XSETINT (CURSIZE (parent), opht + delta1);
! (*setsizefun) (window, XINT (*sizep) + delta1, 0);
!
! /* Squeeze out delta1 lines or columns from our parent,
! shriking this window and siblings proportionately.
! This brings parent back to correct size.
! Delta1 was calculated so this makes this window the desired size,
! taking it all out of the siblings. */
! (*setsizefun) (parent, opht, 0);
!
! }
}
XSETFASTINT (p->last_modified, 0);