[Emacs-diffs] Changes to emacs/src/window.c

[Richard M. Stallman]

Index: emacs/src/window.c
diff -c emacs/src/window.c:1.398 emacs/src/window.c:1.399
*** emacs/src/window.c:1.398    Thu Jan 17 22:50:15 2002
--- emacs/src/window.c  Sun Jan 20 18:09:45 2002
***************
*** 2118,2124 ****
     might crash Emacs.  */
  
  #define MIN_SAFE_WINDOW_WIDTH  (2)
! #define MIN_SAFE_WINDOW_HEIGHT (2)
  
  /* Make sure that window_min_height and window_min_width are
     not too small; if they are, set them to safe minima.  */
--- 2118,2124 ----
     might crash Emacs.  */
  
  #define MIN_SAFE_WINDOW_WIDTH  (2)
! #define MIN_SAFE_WINDOW_HEIGHT (1)
  
  /* Make sure that window_min_height and window_min_width are
     not too small; if they are, set them to safe minima.  */
***************
*** 3547,3563 ****
        {
          /* 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;
            }
        }
--- 3547,3575 ----
        {
          /* If trying to grow this window to or beyond size of the parent,
             just delete all the sibling windows.  */
!         Lisp_Object start, tem, next;
  
!         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;
!             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;
            }
        }