patch 8.2.2880: unified diff fails if actually used
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 #8197)
diff --git a/src/diff.c b/src/diff.c
index 0a0594c..6f25c37 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -1007,10 +1007,12 @@
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 = TRUE;
}
fclose(fd);