From a0c8aea479ca055ce43ba2984a9933f6c48e6161 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 20 Mar 2021 19:55:35 +0100 Subject: patch 8.2.2631: commands from winrestcmd() do not always work properly Problem: Commands from winrestcmd() do not always work properly. (Leonid V. Fedorenchik) Solution: Repeat the size commands twice. (closes #7988) --- src/evalwindow.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'src/evalwindow.c') diff --git a/src/evalwindow.c b/src/evalwindow.c index e00747a2d..b1b60d153 100644 --- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -1007,18 +1007,25 @@ f_winnr(typval_T *argvars UNUSED, typval_T *rettv) f_winrestcmd(typval_T *argvars UNUSED, typval_T *rettv) { win_T *wp; - int winnr = 1; + int i; + int winnr; garray_T ga; char_u buf[50]; ga_init2(&ga, (int)sizeof(char), 70); - FOR_ALL_WINDOWS(wp) + + // Do this twice to handle some window layouts properly. + for (i = 0; i < 2; ++i) { - sprintf((char *)buf, ":%dresize %d|", winnr, wp->w_height); - ga_concat(&ga, buf); - sprintf((char *)buf, "vert :%dresize %d|", winnr, wp->w_width); - ga_concat(&ga, buf); - ++winnr; + winnr = 1; + FOR_ALL_WINDOWS(wp) + { + sprintf((char *)buf, ":%dresize %d|", winnr, wp->w_height); + ga_concat(&ga, buf); + sprintf((char *)buf, "vert :%dresize %d|", winnr, wp->w_width); + ga_concat(&ga, buf); + ++winnr; + } } ga_append(&ga, NUL); -- cgit v1.2.1