Mercurial > vim
diff src/diff.c @ 12971:ca3cb1997f08 v8.0.1361
patch 8.0.1361: some users don't want to diff with hidden buffers
commit https://github.com/vim/vim/commit/97ce419201421f65f4764549ed80307a7ef9c7a6
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Dec 1 20:35:58 2017 +0100
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 https://github.com/vim/vim/issues/2394)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 01 Dec 2017 20:45:08 +0100 |
| parents | 730e802bd3b1 |
| children | 69517d67421f |
line wrap: on
line diff
--- a/src/diff.c +++ b/src/diff.c @@ -23,6 +23,7 @@ static int diff_busy = FALSE; /* ex_diff #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 @@ diffopt_changed(void) 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 @@ diffopt_horizontal(void) } /* + * 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. */