From e50875b3e321428b88b5f2313246995811a82fac Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Mon, 1 Mar 2021 18:49:41 -0500 Subject: vim-patch:8.2.2560: setting 'winminheigt' does not take tabline into account Problem: Setting 'winminheigt' does not take tabline into account. Solution: Subtract the tabline from the available height. (closes vim/vim#7899) https://github.com/vim/vim/commit/39d4cab494248131b6fb07aba633aa4da7871a57 N/A patches for version.c: vim-patch:8.1.0680: not easy to see what features are unavailable Problem: Not easy to see what features are unavailable. Solution: Highlight disabled features in the :version output. (Nazri Ramliy, closes vim/vim#3756) https://github.com/vim/vim/commit/c85ffc9daba6f66d5958ae80249d26f7f81bfced vim-patch:8.2.2196: :version output has extra spaces in compile and link command Problem: :version output has extra spaces in compile and link command. Solution: Adjust QUOTESED. (closes vim/vim#7505) https://github.com/vim/vim/commit/abcbb0e9ad43fc25077e1681528e72ddcbeed300 vim-patch:8.2.2551: MS-Windows: colors test file is not installed Problem: MS-Windows: colors test file is not installed. Solution: Also copy runtime/colors/tools. (Ken Takata, closes vim/vim#7902) https://github.com/vim/vim/commit/d0bce504ec52def729fffa35c8896979af348d32 vim-patch:8.2.2559: MS-Windows: guifont test fails on Windows XP Problem: MS-Windows: guifont test fails on Windows XP. Solution: Check windowsversion(). https://github.com/vim/vim/commit/3650fd709807d5ac182e28d952cbd790c1ad0a6a --- src/nvim/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/window.c') diff --git a/src/nvim/window.c b/src/nvim/window.c index 00f49724b6..7c74d43baf 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; -- cgit From f32acc70e84a3ea4a61e856e4d723ccc433e687c Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Mon, 1 Mar 2021 23:01:09 -0500 Subject: vim-patch:8.2.2236: 'scroll' option can change when setting the statusline Problem: 'scroll' option can change when setting the statusline or tabline but the option context is not updated. Solution: Update the script context when the scroll option is changed as a side effect. (Christian Brabandt, closes vim/vim#7533) https://github.com/vim/vim/commit/746670604a60cb0356b56c112ffb6d297c679099 --- src/nvim/window.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/nvim/window.c') diff --git a/src/nvim/window.c b/src/nvim/window.c index 7c74d43baf..0f717a2f90 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -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; + } } /* -- cgit