GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 01:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.1388: Scrolling one line too far with 'nosmoothscroll' page scrolling

Browse Source 
Problem:  One-off error in "count" to make "w_skipcol" zero with
          'nosmoothscroll' page scrolling when last virtual line
          in a buffer line is exactly the entire window width.
          (Hirohito Higashi)
Solution: Properly compute the smallest integer value necessary
          to make "w_skipcol" zero (Luuk van Baal)

fixes: #17317
closes: #17318

Signed-off-by: Luuk van Baal <luukvbaal@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Luuk van Baal
2025-05-14 20:21:55 +02:00
committed by Christian Brabandt
parent 0077282c82
commit c6c72d165c
3 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/move.c
View File

@ -3215,10 +3215,10 @@ static int scroll_with_sms(int dir, long count, long *curscount)
int width1 = curwin->w_width - curwin_col_off();
int width2 = width1 + curwin_col_off2();
count = 1 + (curwin->w_skipcol - width1) / width2;
count = 1 + (curwin->w_skipcol - width1 - 1) / width2;
if (fixdir == FORWARD)
count = 2 + (linetabsize_eol(curwin, curwin->w_topline)
- curwin->w_skipcol - width1) / width2;
count = 1 + (linetabsize_eol(curwin, curwin->w_topline)
- curwin->w_skipcol - width1 + width2 - 1) / width2;
scroll_redraw(fixdir == FORWARD, count);
*curscount += count * (fixdir == dir ? 1 : -1);
}

17
src/testdir/test_normal.vim
View File

@ -4354,4 +4354,21 @@ func Test_scroll_longline_benchmark()
bwipe!
endfunc
" Test Ctrl-B with 'nosmoothscroll' not stuck with line exactly window width.
func Test_scroll_longline_winwidth()
10new
call setline(1, ['']->repeat(20) + ['A'->repeat(20 * winwidth(0))] + ['']->repeat(20))
exe "normal! G3\<C-B>"
call assert_equal(22, line('w0'))
exe "normal! \<C-B>"
call assert_equal(21, line('w0'))
exe "normal! \<C-B>"
call assert_equal(11, line('w0'))
exe "normal! \<C-B>"
call assert_equal(3, line('w0'))
exe "normal! \<C-B>"
call assert_equal(1, line('w0'))
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab nofoldenable

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1388,
/**/
1387,
/**/