patch 8.0.1361: some users don't want to diff with hidden buffers
Problem: Some users don't want to diff with hidden buffers.
Solution: Add the "hiddenoff" item to 'diffopt'. (Alisue, closes #2394)
diff --git a/src/diff.c b/src/diff.c
index 11952c7..2f5b38c 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -23,6 +23,7 @@
#define DIFF_IWHITE 4 /* ignore change in white space */
#define DIFF_HORIZONTAL 8 /* horizontal splits */
#define DIFF_VERTICAL 16 /* vertical splits */
+#define DIFF_HIDDEN_OFF 32 /* diffoff when hidden */
static int diff_flags = DIFF_FILLER;
#define LBUFLEN 50 /* length of line in diff file */
@@ -1924,6 +1925,11 @@
p += 11;
diff_foldcolumn_new = getdigits(&p);
}
+ else if (STRNCMP(p, "hiddenoff", 9) == 0)
+ {
+ p += 9;
+ diff_flags_new |= DIFF_HIDDEN_OFF;
+ }
if (*p != ',' && *p != NUL)
return FAIL;
if (*p == ',')
@@ -1962,6 +1968,15 @@
}
/*
+ * Return TRUE if 'diffopt' contains "hiddenoff".
+ */
+ int
+diffopt_hiddenoff(void)
+{
+ return (diff_flags & DIFF_HIDDEN_OFF) != 0;
+}
+
+/*
* Find the difference within a changed line.
* Returns TRUE if the line was added, no other buffer has it.
*/