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

patch 8.2.3925: diff mode confused by NUL bytes

Problem:    Diff mode confused by NUL bytes.
Solution:   Handle NUL bytes differently. (Christian Brabandt, closes #9421,
            closes #9418)
This commit is contained in:
Bram Moolenaar
2021-12-28 18:30:05 +00:00
parent 7473a84cf9
commit 06f6095623
7 changed files with 131 additions and 4 deletions

View File

@@ -1417,4 +1417,41 @@ func Test_diff_modify_chunks()
%bw!
endfunc
func Test_diff_binary()
CheckScreendump
let content =<< trim END
call setline(1, ['a', 'b', "c\n", 'd', 'e', 'f', 'g'])
vnew
call setline(1, ['A', 'b', 'c', 'd', 'E', 'f', 'g'])
windo diffthis
wincmd p
norm! gg0
redraw!
END
call writefile(content, 'Xtest_diff_bin')
let buf = RunVimInTerminal('-S Xtest_diff_bin', {})
" Test using internal diff
call VerifyScreenDump(buf, 'Test_diff_bin_01', {})
" Test using internal diff and case folding
call term_sendkeys(buf, ":set diffopt+=icase\<cr>")
call term_sendkeys(buf, "\<C-l>")
call VerifyScreenDump(buf, 'Test_diff_bin_02', {})
" Test using external diff
call term_sendkeys(buf, ":set diffopt=filler\<cr>")
call term_sendkeys(buf, "\<C-l>")
call VerifyScreenDump(buf, 'Test_diff_bin_03', {})
" Test using external diff and case folding
call term_sendkeys(buf, ":set diffopt=filler,icase\<cr>")
call term_sendkeys(buf, "\<C-l>")
call VerifyScreenDump(buf, 'Test_diff_bin_04', {})
" clean up
call StopVimInTerminal(buf)
call delete('Xtest_diff_bin')
set diffopt&vim
endfunc
" vim: shiftwidth=2 sts=2 expandtab