mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-14 03:04:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.2.0904: "zb" scrolls incorrectly with cursor just above fold (#41143)

Browse Source 
Problem:  "zb" scrolls incorrectly with cursor just above fold.
Solution: Handle boff.lnum being set to the last line of a fold
          (zeertzjq).

With the cursor just above fold, botline_forw() moves boff.lnum to the
last line of the fold, but curwin->w_botline is at the first line of the
fold, so the boff.lnum == curwin->w_botline condition never holds.

Instead, check that boff.lnum has just moved to or past w_botline by
comparing its previous value with w_botline.

Also make a similar change to the loff.lnum check above for symmetry.
That one doesn't change behavior, as topline_back() sets loff.lnum to
the first line of a fold.

related: neovim/neovim#41122
closes:  vim/vim#20923

aee686334c
(cherry picked from commit 21a0227d2f)
This commit is contained in:
zeertzjq
2026-08-04 07:43:09 +08:00
committed by github-actions[bot]
parent c34d02ac79
commit 327c04a0d1
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/move.c
View File

@@ -2040,6 +2040,7 @@ void scroll_cursor_bot(win_T *wp, int min_scroll, bool set_topbot)
break;
}
linenr_T loff_lnum_before = loff.lnum;
// Add one line above
topline_back(wp, &loff);
if (loff.height == MAXCOL) {
@@ -2055,13 +2056,13 @@ void scroll_cursor_bot(win_T *wp, int min_scroll, bool set_topbot)
|| loff.fill <= fill_below_window)) {
// Count screen lines that are below the window.
scrolled += loff.height;
if (loff.lnum == wp->w_botline
&& loff.fill == 0) {
if (loff.lnum == wp->w_botline && loff_lnum_before > curwin->w_botline) {
scrolled -= wp->w_empty_rows;
}
}
if (boff.lnum < wp->w_buffer->b_ml.ml_line_count) {
linenr_T boff_lnum_before = boff.lnum;
// Add one line below
botline_forw(wp, &boff);
assert(boff.height != MAXCOL);
@@ -2077,8 +2078,7 @@ void scroll_cursor_bot(win_T *wp, int min_scroll, bool set_topbot)
&& boff.fill > wp->w_filler_rows)) {
// Count screen lines that are below the window.
scrolled += boff.height;
if (boff.lnum == wp->w_botline
&& boff.fill == 0) {
if (boff.lnum >= curwin->w_botline && boff_lnum_before < curwin->w_botline) {
scrolled -= wp->w_empty_rows;
}
}

9
test/old/testdir/test_normal.vim
View File

@@ -4307,16 +4307,21 @@ func Test_single_line_filler_zb()
endfunc
" Test for zb with fewer buffer lines than window height, non-zero 'scrolloff'
" and cursor on fold.
func Test_zb_with_cursor_on_fold()
" and cursor on or just above a fold.
func Test_zb_with_cursor_on_or_just_above_fold()
15new
call setline(1, range(1, 5) + ['', 'foo{{{', 'bar}}}', '', 'baz'])
setlocal foldmethod=marker scrolloff=1
call assert_equal(8, foldclosedend(7))
call cursor(7, 1)
normal! zb
call assert_equal(1, line('w0'))
call cursor(6, 1)
normal! zb
call assert_equal(1, line('w0'))
bwipe!
endfunc