diff options
| -rw-r--r-- | src/move.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_breakindent.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/move.c b/src/move.c index aa90b528a..d90e4d2d9 100644 --- a/src/move.c +++ b/src/move.c @@ -1125,10 +1125,10 @@ curs_columns( n = curwin->w_wrow + so; else 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; - if (extra == 3 || p_lines < so * 2) + if (extra == 3 || p_lines <= so * 2) { // not enough room for 'scrolloff', put cursor in the middle n = curwin->w_virtcol / width; diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim index 42b8c8cf2..98aff02ae 100644 --- a/src/testdir/test_breakindent.vim +++ b/src/testdir/test_breakindent.vim @@ -634,7 +634,7 @@ func Test_breakindent19_sbr_nextpage() call s:compare_lines(expect, lines) " Scroll down one screen line setl scrolloff=5 - norm! 5gj + norm! 6gj redraw! let lines = s:screen_lines(1, 20) let expect = [ diff --git a/src/version.c b/src/version.c index 88cbd0702..708fb95e5 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2495, +/**/ 2494, /**/ 2493, |