From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 16 Jul 2014 13:18:26 +0000 (+0200)
Subject: updated for version 7.4.368
X-Git-Tag: v7.4.368
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b643e777824c76034cbd8e77f603a0b98f2b26fb;p=vim

updated for version 7.4.368
Problem:    Restoring the window sizes after closing the command line window
            doesn't work properly if there are nested splits.
Solution:   Restore the sizes twice. (Hirohito Higashi)
---

diff --git a/src/version.c b/src/version.c
index 1e031cb4d..407541af0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    368,
 /**/
     367,
 /**/
diff --git a/src/window.c b/src/window.c
index 482692ffc..cbf0ff86b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4848,15 +4848,20 @@ win_size_restore(gap)
     garray_T	*gap;
 {
     win_T	*wp;
-    int		i;
+    int		i, j;
 
     if (win_count() * 2 == gap->ga_len)
     {
-	i = 0;
-	for (wp = firstwin; wp != NULL; wp = wp->w_next)
+	/* The order matters, because frames contain other frames, but it's
+	 * difficult to get right. The easy way out is to do it twice. */
+	for (j = 0; j < 2; ++j)
 	{
-	    frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]);
-	    win_setheight_win(((int *)gap->ga_data)[i++], wp);
+	    i = 0;
+	    for (wp = firstwin; wp != NULL; wp = wp->w_next)
+	    {
+		frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]);
+		win_setheight_win(((int *)gap->ga_data)[i++], wp);
+	    }
 	}
 	/* recompute the window positions */
 	(void)win_comp_pos();