diff options
| -rw-r--r-- | src/move.c | 6 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_smooth_long_9.dump | 10 | ||||
| -rw-r--r-- | src/testdir/test_scroll_opt.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 19 insertions, 6 deletions
diff --git a/src/move.c b/src/move.c index d976697ec..7a9ae3ea6 100644 --- a/src/move.c +++ b/src/move.c @@ -1909,7 +1909,11 @@ adjust_skipcol(void) int scrolled = FALSE; validate_cheight(); - if (curwin->w_cline_height == curwin->w_height) + if (curwin->w_cline_height == curwin->w_height + // w_cline_height may be capped at w_height, check there aren't + // actually more lines. + && plines_win(curwin, curwin->w_cursor.lnum, FALSE) + <= curwin->w_height) { // the line just fits in the window, don't scroll reset_skipcol(); diff --git a/src/testdir/dumps/Test_smooth_long_9.dump b/src/testdir/dumps/Test_smooth_long_9.dump index 8365ecc0a..f4687be51 100644 --- a/src/testdir/dumps/Test_smooth_long_9.dump +++ b/src/testdir/dumps/Test_smooth_long_9.dump @@ -1,6 +1,6 @@ -|<+0#4040ff13#ffffff0@2|o+0#0000000&|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o -|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o -|f| |t|e|x|t| |w|i>t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e +|<+0#4040ff13#ffffff0@2|t+0#0000000&|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t +|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o +|t|s| |o|f| |t|e|x>t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o +|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e |x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w -|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| |l|o|t|s| |o|f| |t|e|x|t| |w|i|t|h| -@22|3|,|1|7|0| @8|6@1|%| +|:|s|e|t| |s|c|r|o|l@1|o| @9|3|,|1|3|0| @8|6@1|%| diff --git a/src/testdir/test_scroll_opt.vim b/src/testdir/test_scroll_opt.vim index 6f8693ba7..58a8bf4f9 100644 --- a/src/testdir/test_scroll_opt.vim +++ b/src/testdir/test_scroll_opt.vim @@ -481,6 +481,13 @@ func Test_smoothscroll_cursor_scrolloff() exe "normal 20h" call s:check_col_calc(1, 4, 61) + " cursor on last line, "gk" should not cause a scroll + set scrolloff=0 + normal G0 + call s:check_col_calc(1, 7, 1) + normal gk + call s:check_col_calc(1, 6, 101) + bwipe! endfunc diff --git a/src/version.c b/src/version.c index b3a8ba4eb..10db24708 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1000, +/**/ 999, /**/ 998, |