Mercurial > vim
changeset 6058:021e16be3c02 v7.4.368
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)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 16 Jul 2014 15:18:26 +0200 |
| parents | d59cc9201149 |
| children | f37b2f0479ca |
| files | src/version.c src/window.c |
| diffstat | 2 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 368, +/**/ 367, /**/ 366,
--- 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();