# HG changeset patch # User Christian Brabandt # Date 1702217769 -3600 # Node ID 8f65cb02af2178ceb96fe69ce8f0b35fbf980839 # Parent 7888fa56bbfec69ee0b04e873233fe86ad2aa91d patch 9.0.2145: wrong scrolling in insert mode with smoothscroll Commit: https://github.com/vim/vim/commit/5b4d1fcbf06757bae32a894871b9a649c84eba7f Author: zeertzjq Date: Sun Dec 3 17:54:10 2023 +0100 patch 9.0.2145: wrong scrolling in insert mode with smoothscroll Problem: Wrong scrolling in Insert mode with 'smoothscroll' at the bottom of the window. Solution: Don't use set_topline() when 'smoothscroll' is set. fixes: #13612 closes: #13613 Signed-off-by: zeertzjq Signed-off-by: Christian Brabandt diff --git a/src/edit.c b/src/edit.c --- a/src/edit.c +++ b/src/edit.c @@ -501,9 +501,12 @@ edit( * something. * Don't do this when the topline changed already, it has * already been adjusted (by insertchar() calling open_line())). + * Also don't do this when 'smoothscroll' is set, as the window should + * then be scrolled by screen lines. */ if (curbuf->b_mod_set && curwin->w_p_wrap + && !curwin->w_p_sms && !did_backspace && curwin->w_topline == old_topline #ifdef FEAT_DIFF diff --git a/src/testdir/dumps/Test_smoothscroll_insert_bottom.dump b/src/testdir/dumps/Test_smoothscroll_insert_bottom.dump new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_smoothscroll_insert_bottom.dump @@ -0,0 +1,9 @@ +|<+0#4040ff13#ffffff0@2|e+0#0000000&|r|y| |l|o|n|g| |l|i|n|e| |.@2|A| |v|e|r|y| |l|o|n|g| |l|i|n|e| |.@2 +|A| |v|e|r|y| |l|o|n|g| |l|i|n|e| |.@2|A| |v|e|r|y| |l|o|n|g| |l|i|n|e| |.@2 +|A| |v|e|r|y| |l|o|n|g| |l|i|n|e| |.@2|A| |v|e|r|y| |l|o|n|g| |l|i|n|e| |.@2 +|A| |v|e|r|y| |l|o|n|g| |l|i|n|e| |.@2|A| |v|e|r|y| |l|o|n|g| |l|i|n|e| |.@2 +|A| |v|e|r|y| |l|o|n|g| |l|i|n|e| |.@2|A| |v|e|r|y| |l|o|n|g| |l|i|n|e| |.@2 +|A| |v|e|r|y| |l|o|n|g| |l|i|n|e| |.@2|A| |v|e|r|y| |l|o|n|g| |l|i|n|e| |.@2 +|1|2|3|4|5|6|7|8|9| @30 +> @39 +@40 diff --git a/src/testdir/test_scroll_opt.vim b/src/testdir/test_scroll_opt.vim --- a/src/testdir/test_scroll_opt.vim +++ b/src/testdir/test_scroll_opt.vim @@ -920,7 +920,7 @@ func Test_smoothscroll_cursor_top() exe "norm G3\k" END call writefile(lines, 'XSmoothScrollCursorTop', 'D') - let buf = RunVimInTerminal('-u NONE -S XSmoothScrollCursorTop', #{rows: 12, cols:40}) + let buf = RunVimInTerminal('-u NONE -S XSmoothScrollCursorTop', #{rows: 12, cols: 40}) call VerifyScreenDump(buf, 'Test_smoothscroll_cursor_top', {}) call StopVimInTerminal(buf) @@ -939,10 +939,25 @@ func Test_smoothscroll_crash() exe "norm! 0\" END call writefile(lines, 'XSmoothScrollCrash', 'D') - let buf = RunVimInTerminal('-u NONE -S XSmoothScrollCrash', #{rows: 12, cols:40}) + let buf = RunVimInTerminal('-u NONE -S XSmoothScrollCrash', #{rows: 12, cols: 40}) call term_sendkeys(buf, "2\\") call StopVimInTerminal(buf) endfunc +func Test_smoothscroll_insert_bottom() + CheckScreendump + + let lines =<< trim END + call setline(1, repeat([repeat('A very long line ...', 10)], 5)) + set wrap smoothscroll scrolloff=0 + END + call writefile(lines, 'XSmoothScrollInsertBottom', 'D') + let buf = RunVimInTerminal('-u NONE -S XSmoothScrollInsertBottom', #{rows: 9, cols: 40}) + call term_sendkeys(buf, "Go123456789\") + call VerifyScreenDump(buf, 'Test_smoothscroll_insert_bottom', {}) + + call StopVimInTerminal(buf) +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2145, +/**/ 2144, /**/ 2143,