aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.2495: text jumps up and down when moving the cursor

Browse Source 
Problem:    Text jumps up and down when moving the cursor in a small window
            with wrapping text and 'scrolloff' set.
Solution:   Adjust the computation of w_skipcol. (partly by Ghjuvan Lacambre,
            closes #7813)
This commit is contained in:
Bram Moolenaar
2021-02-10 21:10:12 +01:00
parent 3ff656f6b4
commit 8f33ebfade
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/move.c
View File

@@ -1125,10 +1125,10 @@ curs_columns(
n = curwin->w_wrow + so; n = curwin->w_wrow + so;
else else
n = p_lines; n = p_lines;
if ((colnr_T)n >= curwin->w_height + curwin->w_skipcol / width) if ((colnr_T)n >= curwin->w_height + curwin->w_skipcol / width - so)
extra += 2; extra += 2;
if (extra == 3 || p_lines < so * 2) if (extra == 3 || p_lines <= so * 2)
{ {
// not enough room for 'scrolloff', put cursor in the middle // not enough room for 'scrolloff', put cursor in the middle
n = curwin->w_virtcol / width; n = curwin->w_virtcol / width;

2
src/testdir/test_breakindent.vim
View File

@@ -634,7 +634,7 @@ func Test_breakindent19_sbr_nextpage()
call s:compare_lines(expect, lines) call s:compare_lines(expect, lines)
" Scroll down one screen line " Scroll down one screen line
setl scrolloff=5 setl scrolloff=5
norm! 5gj norm! 6gj
redraw! redraw!
let lines = s:screen_lines(1, 20) let lines = s:screen_lines(1, 20)
let expect = [ let expect = [

2
src/version.c
View File

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