Mercurial > vim
changeset 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 | 06d24dd1299b |
| children | 8ce5ee69c0bb |
| files | runtime/doc/options.txt src/buffer.c src/diff.c src/proto/diff.pro src/testdir/test_diffmode.vim src/version.c |
| diffstat | 6 files changed, 49 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2634,6 +2634,9 @@ A jump table for the options with a shor vertical Start diff mode with vertical splits (unless explicitly specified otherwise). + hiddenoff Do not use diff mode for a buffer when it + becomes hidden. + foldcolumn:{n} Set the 'foldcolumn' option to {n} when starting diff mode. Without this 2 is used.
--- a/src/buffer.c +++ b/src/buffer.c @@ -593,6 +593,11 @@ aucmd_abort: if (buf->b_nwindows > 0) --buf->b_nwindows; +#ifdef FEAT_DIFF + if (diffopt_hiddenoff() && !unload_buf && buf->b_nwindows == 0) + diff_buf_delete(buf); /* Clear 'diff' for hidden buffer. */ +#endif + /* Return when a window is displaying the buffer or when it's not * unloaded. */ if (buf->b_nwindows > 0 || !unload_buf)
--- 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. */
--- a/src/proto/diff.pro +++ b/src/proto/diff.pro @@ -16,6 +16,7 @@ int diff_check_fill(win_T *wp, linenr_T void diff_set_topline(win_T *fromwin, win_T *towin); int diffopt_changed(void); int diffopt_horizontal(void); +int diffopt_hiddenoff(void); int diff_find_change(win_T *wp, linenr_T lnum, int *startp, int *endp); int diff_infold(win_T *wp, linenr_T lnum); void nv_diffgetput(int put, long count);
--- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -375,6 +375,29 @@ func Test_diffopt_vertical() %bwipe endfunc +func Test_diffopt_hiddenoff() + set diffopt=filler,foldcolumn:0,hiddenoff + e! one + call setline(1, ['Two', 'Three']) + redraw + let normattr = screenattr(1, 1) + diffthis + botright vert new two + call setline(1, ['One', 'Four']) + diffthis + redraw + call assert_notequal(normattr, screenattr(1, 1)) + set hidden + close + redraw + " should not diffing with hidden buffer two while 'hiddenoff' is enabled + call assert_equal(normattr, screenattr(1, 1)) + + bwipe! + bwipe! + set hidden& diffopt& +endfunc + func Test_diffoff_hidden() set diffopt=filler,foldcolumn:0 e! one