aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-04 05:25:06 -04:00
Code Activity

patch 8.2.3394: filler lines are wrong when changing text in diff mode

Browse Source 
Problem:    Filler lines are wrong when changing text in diff mode.
Solution:   Don't change the filler lines on every change.  Check
            scrollbinding when updating the filler lines. (closes #8809)
This commit is contained in:
Bram Moolenaar
2021-09-01 16:02:07 +02:00
parent 6631597452
commit 04626c243c
6 changed files with 86 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/testdir/test_diffmode.vim
View File

@@ -993,6 +993,30 @@ func Test_diff_screen()
call delete('XdiffSetup')
endfunc
func Test_diff_with_scroll_and_change()
CheckScreendump
let lines =<< trim END
call setline(1, range(1, 15))
vnew
call setline(1, range(9, 15))
windo diffthis
wincmd h
exe "normal Gl5\<C-E>"
END
call writefile(lines, 'Xtest_scroll_change')
let buf = RunVimInTerminal('-S Xtest_scroll_change', {})
call VerifyScreenDump(buf, 'Test_diff_scroll_change_01', {})
call term_sendkeys(buf, "ax\<Esc>")
call VerifyScreenDump(buf, 'Test_diff_scroll_change_02', {})
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_scroll_change')
endfunc
func Test_diff_with_cursorline()
CheckScreendump