mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
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 <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
4e26a9aab6
commit
5b4d1fcbf0
@@ -501,9 +501,12 @@ edit(
|
|||||||
* something.
|
* something.
|
||||||
* Don't do this when the topline changed already, it has
|
* Don't do this when the topline changed already, it has
|
||||||
* already been adjusted (by insertchar() calling open_line())).
|
* 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
|
if (curbuf->b_mod_set
|
||||||
&& curwin->w_p_wrap
|
&& curwin->w_p_wrap
|
||||||
|
&& !curwin->w_p_sms
|
||||||
&& !did_backspace
|
&& !did_backspace
|
||||||
&& curwin->w_topline == old_topline
|
&& curwin->w_topline == old_topline
|
||||||
#ifdef FEAT_DIFF
|
#ifdef FEAT_DIFF
|
||||||
|
9
src/testdir/dumps/Test_smoothscroll_insert_bottom.dump
Normal file
9
src/testdir/dumps/Test_smoothscroll_insert_bottom.dump
Normal file
@@ -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
|
@@ -920,7 +920,7 @@ func Test_smoothscroll_cursor_top()
|
|||||||
exe "norm G3\<C-E>k"
|
exe "norm G3\<C-E>k"
|
||||||
END
|
END
|
||||||
call writefile(lines, 'XSmoothScrollCursorTop', 'D')
|
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 VerifyScreenDump(buf, 'Test_smoothscroll_cursor_top', {})
|
||||||
|
|
||||||
call StopVimInTerminal(buf)
|
call StopVimInTerminal(buf)
|
||||||
@@ -939,10 +939,25 @@ func Test_smoothscroll_crash()
|
|||||||
exe "norm! 0\<c-e>"
|
exe "norm! 0\<c-e>"
|
||||||
END
|
END
|
||||||
call writefile(lines, 'XSmoothScrollCrash', 'D')
|
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\<C-E>\<C-L>")
|
call term_sendkeys(buf, "2\<C-E>\<C-L>")
|
||||||
|
|
||||||
call StopVimInTerminal(buf)
|
call StopVimInTerminal(buf)
|
||||||
endfunc
|
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\<CR>")
|
||||||
|
call VerifyScreenDump(buf, 'Test_smoothscroll_insert_bottom', {})
|
||||||
|
|
||||||
|
call StopVimInTerminal(buf)
|
||||||
|
endfunc
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
@@ -704,6 +704,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 */
|
||||||
|
/**/
|
||||||
|
2145,
|
||||||
/**/
|
/**/
|
||||||
2144,
|
2144,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user