mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-18 07:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2880: unified diff fails if actually used

Browse Source 
Problem:    Unified diff fails if actually used.
Solution:   Invoke :diffupdate in the test.  Fix the check for working external
            diff. (Ghjuvan Lacambre, Christian Brabandt, closes vim/vim#8197)
ad5c178a19
This commit is contained in:
Jan Edmund Lazo
2021-05-24 12:19:25 -04:00
parent 0a653f7ab9
commit 6d932ccb1c
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nvim/diff.c
View File

@@ -982,12 +982,14 @@ static int check_external_diff(diffio_T *diffio)
char_u linebuf[LBUFLEN];
for (;;) {
// There must be a line that contains "1c1".
// For normal diff there must be a line that contains
// "1c1". For unified diff "@@ -1 +1 @@".
if (vim_fgets(linebuf, LBUFLEN, fd)) {
break;
}
if (STRNCMP(linebuf, "1c1", 3) == 0) {
if (STRNCMP(linebuf, "1c1", 3) == 0
|| STRNCMP(linebuf, "@@ -1 +1 @@", 11) == 0) {
ok = kTrue;
}
}