Mercurial > vim
changeset 33769:6e4bf51ec635 v9.0.2105
patch 9.0.2105: skipcol not reset when topline changed
Commit: https://github.com/vim/vim/commit/bb800a7907209f7d349f87b76b3b9ca30b416298
Author: Luuk van Baal <luukvbaal@gmail.com>
Date: Tue Nov 14 17:05:18 2023 +0100
patch 9.0.2105: skipcol not reset when topline changed
Problem: Skipcol is not reset when topline changed scrolling cursor to top
Solution: reset skipcol
closes: #13528
closes: #13532
Signed-off-by: Luuk van Baal <luukvbaal@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 14 Nov 2023 17:15:05 +0100 |
| parents | 95830543949f |
| children | f27ffcd85d9d |
| files | src/move.c src/testdir/dumps/Test_smoothscroll_cursor_top.dump src/testdir/test_scroll_opt.vim src/version.c |
| diffstat | 4 files changed, 36 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/move.c +++ b/src/move.c @@ -2423,7 +2423,9 @@ scroll_cursor_top(int min_scroll, int al } check_topfill(curwin, FALSE); #endif - if (curwin->w_topline == curwin->w_cursor.lnum) + if (curwin->w_topline != old_topline) + reset_skipcol(); + else if (curwin->w_topline == curwin->w_cursor.lnum) { validate_virtcol(); if (curwin->w_skipcol >= curwin->w_virtcol)
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_smoothscroll_cursor_top.dump @@ -0,0 +1,12 @@ +| +0&#ffffff0@39 +|[+1&&|N|o| |N|a|m|e|]| @30 +|l+0&&|i|n|e|1| @34 +|l|i|n|e|2| @34 +>l|i|n|e|3|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3 +|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3 +|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3|l|i|n|e|3| @19 +|l|i|n|e|4| @34 +|~+0#4040ff13&| @38 +|~| @38 +|[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @26 +| +0&&@39
--- a/src/testdir/test_scroll_opt.vim +++ b/src/testdir/test_scroll_opt.vim @@ -909,4 +909,21 @@ func Test_smoothscroll_zero_width_scroll call StopVimInTerminal(buf) endfunc +" scroll_cursor_top() should reset skipcol when it changes topline +func Test_smoothscroll_cursor_top() + CheckScreendump + + let lines =<< trim END + set smoothscroll scrolloff=2 + new | 11resize | wincmd j + call setline(1, ['line1', 'line2', 'line3'->repeat(20), 'line4']) + exe "norm G3\<C-E>k" + END + call writefile(lines, 'XSmoothScrollCursorTop', 'D') + let buf = RunVimInTerminal('-u NONE -S XSmoothScrollCursorTop', #{rows: 12, cols:40}) + call VerifyScreenDump(buf, 'Test_smoothscroll_cursor_top', {}) + + call StopVimInTerminal(buf) +endfunc + " vim: shiftwidth=2 sts=2 expandtab