diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-12-30 15:59:11 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-30 15:59:11 +0800 |
| commit | cb9d68fe6daf214ba703b9c2376fc8a2b8ae7079 (patch) | |
| tree | 6f39ab5d25d1c9ef92bd5a33d8f316ae1673c93e /src/nvim/window.c | |
| parent | 4703e561d5bc0eef13da171c4f8f8b6e02ae4883 (diff) | |
| parent | d7855caa183f9eacc7cfd3f2ab7f071063ff84af (diff) | |
| download | rneovim-cb9d68fe6daf214ba703b9c2376fc8a2b8ae7079.tar.gz rneovim-cb9d68fe6daf214ba703b9c2376fc8a2b8ae7079.tar.bz2 rneovim-cb9d68fe6daf214ba703b9c2376fc8a2b8ae7079.zip | |
Merge pull request #21591 from zeertzjq/vim-8.2.3773
vim-patch:8.2.{3773,3774}
Diffstat (limited to 'src/nvim/window.c')
| -rw-r--r-- | src/nvim/window.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index fe771c52c6..4c03893173 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -4277,7 +4277,9 @@ static int leave_tabpage(buf_T *new_curbuf, bool trigger_leave_autocmds) tp->tp_firstwin = firstwin; tp->tp_lastwin = lastwin; tp->tp_old_Rows_avail = ROWS_AVAIL; - tp->tp_old_Columns = Columns; + if (tp->tp_old_Columns != -1) { + tp->tp_old_Columns = Columns; + } firstwin = NULL; lastwin = NULL; return OK; @@ -4340,8 +4342,13 @@ static void enter_tabpage(tabpage_T *tp, buf_T *old_curbuf, bool trigger_enter_a if (curtab->tp_old_Rows_avail != ROWS_AVAIL || (old_off != firstwin->w_winrow)) { win_new_screen_rows(); } - if (curtab->tp_old_Columns != Columns && starting == 0) { - win_new_screen_cols(); // update window widths + if (curtab->tp_old_Columns != Columns) { + if (starting == 0) { + win_new_screen_cols(); // update window widths + curtab->tp_old_Columns = Columns; + } else { + curtab->tp_old_Columns = -1; // update window widths later + } } lastused_tabpage = old_curtab; |