mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-29 02:21:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3394: filler lines are wrong when changing text in diff mode (#15547)

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 vim/vim#8809)
04626c243c
This commit is contained in:
Jaehwang Jerry Jung
2021-09-19 01:38:58 +09:00
committed by GitHub
parent 51a98aa0c2
commit de406f651c
4 changed files with 115 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/nvim/testdir/test_diffmode.vim
View File

@@ -965,6 +965,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