Merge pull request #1183 from Shougo/vim-patch-7.4.368

vim-patch:7.4.368
This commit is contained in:
Justin M. Keyes 2014-09-16 14:16:29 -04:00
commit fd60b8ee7e
2 changed files with 10 additions and 5 deletions

View File

@ -227,7 +227,7 @@ static int included_patches[] = {
371, 371,
370, 370,
//369, //369,
//368, 368,
367, 367,
//366, //366,
//365, //365,

View File

@ -3800,11 +3800,16 @@ void win_size_save(garray_T *gap)
void win_size_restore(garray_T *gap) void win_size_restore(garray_T *gap)
{ {
if (win_count() * 2 == gap->ga_len) { if (win_count() * 2 == gap->ga_len) {
/* 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 (int j = 0; j < 2; ++j)
{
int i = 0; int i = 0;
FOR_ALL_WINDOWS(wp) { FOR_ALL_WINDOWS(wp) {
frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]); frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]);
win_setheight_win(((int *)gap->ga_data)[i++], wp); win_setheight_win(((int *)gap->ga_data)[i++], wp);
} }
}
/* recompute the window positions */ /* recompute the window positions */
(void)win_comp_pos(); (void)win_comp_pos();
} }