To: vim-dev@vim.org
Subject: Patch 6.1.415
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.1.415
Problem:    When there is a vertical split and a quickfix window, reducing the
	    size of the Vim window may result in a wrong window layout and a
	    crash.
Solution:   When reducing the window size and there is not enough space for
	    'winfixheight' set the frame height to the larger height, so that
	    there is a retry while ignoring 'winfixheight'. (Yasuhiro
	    Matsumoto)
Files:	    src/window.c


*** ../vim61.414/src/window.c	Sun Mar  9 15:45:10 2003
--- src/window.c	Tue Mar 25 22:28:36 2003
***************
*** 2135,2143 ****
  #ifdef FEAT_VERTSPLIT
      else if (topfrp->fr_layout == FR_ROW)
      {
! 	/* All frames in this row get the same new height. */
! 	for (frp = topfrp->fr_child; frp != NULL; frp = frp->fr_next)
! 	    frame_new_height(frp, height, topfirst, wfh);
      }
  #endif
      else
--- 2135,2155 ----
  #ifdef FEAT_VERTSPLIT
      else if (topfrp->fr_layout == FR_ROW)
      {
! 	do
! 	{
! 	    /* All frames in this row get the same new height. */
! 	    for (frp = topfrp->fr_child; frp != NULL; frp = frp->fr_next)
! 	    {
! 		frame_new_height(frp, height, topfirst, wfh);
! 		if (frp->fr_height > height)
! 		{
! 		    /* Could not fit the windows, make the whole row higher. */
! 		    height = frp->fr_height;
! 		    break;
! 		}
! 	    }
! 	}
! 	while (frp != NULL);
      }
  #endif
      else
*** ../vim61.414/src/version.c	Tue Mar 25 21:39:47 2003
--- src/version.c	Tue Mar 25 22:26:48 2003
***************
*** 613,614 ****
--- 613,616 ----
  {   /* Add new patch number below this line */
+ /**/
+     415,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
210. When you get a divorce, you don't care about who gets the children,
     but discuss endlessly who can use the email address.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\     Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///