diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-03-02 18:43:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-02 18:43:52 -0500 |
| commit | bda12927be84f0e0e05e885f9acb40a7ac2c5524 (patch) | |
| tree | f4b493647eaea612ca3e0dca211ae3a2730a6132 /src/nvim/window.c | |
| parent | c1fbc2ddf15b2f44b615f90b2511349ab974cb83 (diff) | |
| parent | 1edc0285c4e563b61d596fc2f8352010bd91cb38 (diff) | |
| download | rneovim-bda12927be84f0e0e05e885f9acb40a7ac2c5524.tar.gz rneovim-bda12927be84f0e0e05e885f9acb40a7ac2c5524.tar.bz2 rneovim-bda12927be84f0e0e05e885f9acb40a7ac2c5524.zip | |
Merge pull request #14041 from janlazo/vim-8.2.2560
vim-patch:8.1.{680,1901},8.2.{1043,2196,2236,2551.2559,2560}
Diffstat (limited to 'src/nvim/window.c')
| -rw-r--r-- | src/nvim/window.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/nvim/window.c b/src/nvim/window.c index 00f49724b6..0f717a2f90 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -5501,7 +5501,7 @@ void win_setminheight(void) // loop until there is a 'winminheight' that is possible while (p_wmh > 0) { - const int room = Rows - p_ch; + const int room = Rows - p_ch - tabline_height(); const int needed = frame_minheight(topframe, NULL); if (room >= needed) { break; @@ -5960,9 +5960,17 @@ void win_new_width(win_T *wp, int width) void win_comp_scroll(win_T *wp) { + const long old_w_p_scr = wp->w_p_scr; + wp->w_p_scr = wp->w_height / 2; - if (wp->w_p_scr == 0) + if (wp->w_p_scr == 0) { wp->w_p_scr = 1; + } + if (wp->w_p_scr != old_w_p_scr) { + // Used by "verbose set scroll". + wp->w_p_script_ctx[WV_SCROLL].script_ctx.sc_sid = SID_WINLAYOUT; + wp->w_p_script_ctx[WV_SCROLL].script_ctx.sc_lnum = 0; + } } /* |