Patch 8.2.3925
Problem: Diff mode confused by NUL bytes.
Solution: Handle NUL bytes differently. (Christian Brabandt, closes #9421,
closes #9418)
Files: src/diff.c, src/testdir/test_diffmode.vim,
src/testdir/dumps/Test_diff_bin_01.dump,
src/testdir/dumps/Test_diff_bin_02.dump,
src/testdir/dumps/Test_diff_bin_03.dump,
src/testdir/dumps/Test_diff_bin_04.dump
*** ../vim-8.2.3924/src/diff.c 2021-12-28 13:54:37.475164202 +0000
--- src/diff.c 2021-12-28 18:21:20.790091624 +0000
***************
*** 777,785 ****
int orig_len;
char_u cbuf[MB_MAXBYTES + 1];
! // xdiff doesn't support ignoring case, fold-case the text.
! c = PTR2CHAR(s);
! c = MB_CASEFOLD(c);
orig_len = mb_ptr2len(s);
if (mb_char2bytes(c, cbuf) != orig_len)
// TODO: handle byte length difference
--- 777,790 ----
int orig_len;
char_u cbuf[MB_MAXBYTES + 1];
! if (*s == NL)
! c = NUL;
! else
! {
! // xdiff doesn't support ignoring case, fold-case the text.
! c = PTR2CHAR(s);
! c = MB_CASEFOLD(c);
! }
orig_len = mb_ptr2len(s);
if (mb_char2bytes(c, cbuf) != orig_len)
// TODO: handle byte length difference
***************
*** 791,797 ****
len += orig_len;
}
else
! ptr[len++] = *s++;
}
ptr[len++] = NL;
}
--- 796,805 ----
len += orig_len;
}
else
! {
! ptr[len++] = *s == NL ? NUL : *s;
! s++;
! }
}
ptr[len++] = NL;
}
*** ../vim-8.2.3924/src/testdir/test_diffmode.vim 2021-12-26
10:51:33.711079465 +0000
--- src/testdir/test_diffmode.vim 2021-12-28 18:21:20.794091619 +0000
***************
*** 1417,1420 ****
--- 1417,1457 ----
%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
*** ../vim-8.2.3924/src/testdir/dumps/Test_diff_bin_01.dump 2021-12-28
18:29:01.405425388 +0000
--- src/testdir/dumps/Test_diff_bin_01.dump 2021-12-28 18:21:20.794091619
+0000
***************
*** 0 ****
--- 1,20 ----
+ | +0#0000e05#a8a8a8255@1>A+2#0000000#ff404010| +0&#ffd7ff255@33||+1&#ffffff0|
+0#0000e05#a8a8a8255@1|a+2#0000000#ff404010| +0&#ffd7ff255@33
+ | +0#0000e05#a8a8a8255@1|b+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|b+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|c+0#0000000#ffd7ff255| @33||+1&#ffffff0|
+0#0000e05#a8a8a8255@1|c+0#0000000#ffd7ff255|^+2#0000e05#ff404010|@|
+0#0000000#ffd7ff255@31
+ | +0#0000e05#a8a8a8255@1|d+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|d+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|E+2#0000000#ff404010| +0&#ffd7ff255@33||+1&#ffffff0|
+0#0000e05#a8a8a8255@1|e+2#0000000#ff404010| +0&#ffd7ff255@33
+ | +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|g+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|g+0#0000000#ffffff0| @33
+ |~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|1|,|1| @11|A|l@1| |[+1&&|N|o|
|N|a|m|e|]| |[|+|]| @5|1|,|1| @11|A|l@1
+ | +0&&@74
*** ../vim-8.2.3924/src/testdir/dumps/Test_diff_bin_02.dump 2021-12-28
18:29:01.409425383 +0000
--- src/testdir/dumps/Test_diff_bin_02.dump 2021-12-28 18:21:20.794091619
+0000
***************
*** 0 ****
--- 1,20 ----
+ | +0#0000e05#a8a8a8255@1>A+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|b+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|b+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|c+0#0000000#ffd7ff255| @33||+1&#ffffff0|
+0#0000e05#a8a8a8255@1|c+0#0000000#ffd7ff255|^+2#0000e05#ff404010|@|
+0#0000000#ffd7ff255@31
+ | +0#0000e05#a8a8a8255@1|d+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|d+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|E+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|e+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|g+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|g+0#0000000#ffffff0| @33
+ |~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|1|,|1| @11|A|l@1| |[+1&&|N|o|
|N|a|m|e|]| |[|+|]| @5|1|,|1| @11|A|l@1
+ | +0&&@74
*** ../vim-8.2.3924/src/testdir/dumps/Test_diff_bin_03.dump 2021-12-28
18:29:01.417425371 +0000
--- src/testdir/dumps/Test_diff_bin_03.dump 2021-12-28 18:21:20.794091619
+0000
***************
*** 0 ****
--- 1,20 ----
+ | +0#0000e05#a8a8a8255@1>A+2#0000000#ff404010| +0&#ffd7ff255@33||+1&#ffffff0|
+0#0000e05#a8a8a8255@1|a+2#0000000#ff404010| +0&#ffd7ff255@33
+ | +0#0000e05#a8a8a8255@1|b+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|b+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|c+0#0000000#ffd7ff255| @33||+1&#ffffff0|
+0#0000e05#a8a8a8255@1|c+0#0000000#ffd7ff255|^+2#0000e05#ff404010|@|
+0#0000000#ffd7ff255@31
+ | +0#0000e05#a8a8a8255@1|d+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|d+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|E+2#0000000#ff404010| +0&#ffd7ff255@33||+1&#ffffff0|
+0#0000e05#a8a8a8255@1|e+2#0000000#ff404010| +0&#ffd7ff255@33
+ | +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|g+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|g+0#0000000#ffffff0| @33
+ |~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|1|,|1| @11|A|l@1| |[+1&&|N|o|
|N|a|m|e|]| |[|+|]| @5|1|,|1| @11|A|l@1
+ | +0&&@74
*** ../vim-8.2.3924/src/testdir/dumps/Test_diff_bin_04.dump 2021-12-28
18:29:01.421425365 +0000
--- src/testdir/dumps/Test_diff_bin_04.dump 2021-12-28 18:21:20.794091619
+0000
***************
*** 0 ****
--- 1,20 ----
+ | +0#0000e05#a8a8a8255@1>A+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|b+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|b+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|c+0#0000000#ffd7ff255| @33||+1&#ffffff0|
+0#0000e05#a8a8a8255@1|c+0#0000000#ffd7ff255|^+2#0000e05#ff404010|@|
+0#0000000#ffd7ff255@31
+ | +0#0000e05#a8a8a8255@1|d+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|d+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|E+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|e+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0| @33
+ | +0#0000e05#a8a8a8255@1|g+0#0000000#ffffff0| @33||+1&&|
+0#0000e05#a8a8a8255@1|g+0#0000000#ffffff0| @33
+ |~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |~| @35||+1#0000000&|~+0#4040ff13&| @35
+ |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|1|,|1| @11|A|l@1| |[+1&&|N|o|
|N|a|m|e|]| |[|+|]| @5|1|,|1| @11|A|l@1
+ | +0&&@74
*** ../vim-8.2.3924/src/version.c 2021-12-28 17:55:22.963786520 +0000
--- src/version.c 2021-12-28 18:29:14.065406884 +0000
***************
*** 751,752 ****
--- 751,754 ----
{ /* Add new patch number below this line */
+ /**/
+ 3925,
/**/
--
hundred-and-one symptoms of being an internet addict:
131. You challenge authority and society by portnuking people
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20211228183206.B6A441C0641%40moolenaar.net.
