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 1e031cb..407541a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 368,
+/**/
367,
/**/
366,
diff --git a/src/window.c b/src/window.c
index 482692f..cbf0ff8 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4848,15 +4848,20 @@
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();
