To: vim-dev@vim.org
Subject: Patch 6.1.317
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.317
Problem:    Closing a window may cause some of the remaining windows to be
	    positioned wrong if there is a mix of horizontal and vertial
	    splits. (Stefan Ingi Valdimarsson)
Solution:   Update the frame sizes before updating the window positions.
Files:	    src/window.c


*** ../vim61.316/src/window.c	Tue Nov 19 11:21:32 2002
--- src/window.c	Sun Feb  2 21:38:59 2003
***************
*** 1974,1989 ****
      /* Remove this frame from the list of frames. */
      frame_remove(frp_close);
  
-     /* If rows/columns go to a window below/right its positions need to be
-      * updated. */
-     if (frp2 == frp_close->fr_next)
-     {
- 	int row = win->w_winrow;
- 	int col = W_WINCOL(win);
- 
- 	frame_comp_pos(frp2, &row, &col);
-     }
- 
  #ifdef FEAT_VERTSPLIT
      if (frp_close->fr_parent->fr_layout == FR_COL)
      {
--- 1974,1979 ----
***************
*** 2009,2014 ****
--- 1999,2014 ----
  	*dirp = 'h';
      }
  #endif
+ 
+     /* If rows/columns go to a window below/right its positions need to be
+      * updated.  Can only be done after the sizes have been updated. */
+     if (frp2 == frp_close->fr_next)
+     {
+ 	int row = win->w_winrow;
+ 	int col = W_WINCOL(win);
+ 
+ 	frame_comp_pos(frp2, &row, &col);
+     }
  
      if (frp2->fr_next == NULL && frp2->fr_prev == NULL)
      {
*** ../vim61.316/src/version.c	Sun Feb  2 13:41:28 2003
--- src/version.c	Sun Feb  2 21:43:05 2003
***************
*** 608,609 ****
--- 608,611 ----
  {   /* Add new patch number below this line */
+ /**/
+     317,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
94. Now admit it... How many of you have made "modem noises" into
    the phone just to see if it was possible? :-)

 /// 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 ///