diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-02-03 23:16:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-02-03 23:16:28 +0100 |
| commit | 25ea0544587dd45088512fec9d7a685e35fea679 (patch) | |
| tree | 0038abd019ded330eb77ba548b1bbd24a343f1b3 | |
| parent | 6b40f303291be6b2fe524b5708e089773048c269 (diff) | |
patch 8.0.0300: cannot stop diffing hidden buffersv8.0.0300
Problem: Cannot stop diffing hidden buffers. (Daniel Hahler)
Solution: When using :diffoff! make the whole list if diffed buffers empty.
(closes #736)
| -rw-r--r-- | src/diff.c | 21 | ||||
| -rw-r--r-- | src/testdir/test_diffmode.vim | 37 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 60 insertions, 0 deletions
diff --git a/src/diff.c b/src/diff.c index a4a2acb95f..8d7421dd73 100644 --- a/src/diff.c +++ b/src/diff.c @@ -139,6 +139,23 @@ diff_buf_add(buf_T *buf) } /* + * Remove all buffers to make diffs for. + */ + static void +diff_buf_clear(void) +{ + int i; + + for (i = 0; i < DB_COUNT; ++i) + if (curtab->tp_diffbuf[i] != NULL) + { + curtab->tp_diffbuf[i] = NULL; + curtab->tp_diff_invalid = TRUE; + diff_redraw(TRUE); + } +} + +/* * Find buffer "buf" in the list of diff buffers for the current tab page. * Return its index or DB_COUNT if not found. */ @@ -1257,6 +1274,10 @@ ex_diffoff(exarg_T *eap) #endif } + /* Also remove hidden buffers from the list. */ + if (eap->forceit) + diff_buf_clear(); + #ifdef FEAT_SCROLLBIND /* Remove "hor" from from 'scrollopt' if there are no diff windows left. */ if (!diffwin && vim_strchr(p_sbo, 'h') != NULL) diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index f40e06ff33..8ee82bd538 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -212,6 +212,7 @@ func Test_diffoff() call setline(1, ['One', '', 'Two', 'Three']) diffthis redraw + call assert_notequal(normattr, screenattr(1, 1)) diffoff! redraw call assert_equal(normattr, screenattr(1, 1)) @@ -219,6 +220,42 @@ func Test_diffoff() bwipe! endfunc +func Test_diffoff_hidden() + set diffopt=filler,foldcolumn:0 + e! one + call setline(1, ['Two', 'Three']) + 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 + " diffing with hidden buffer two + call assert_notequal(normattr, screenattr(1, 1)) + diffoff + redraw + call assert_equal(normattr, screenattr(1, 1)) + diffthis + redraw + " still diffing with hidden buffer two + call assert_notequal(normattr, screenattr(1, 1)) + diffoff! + redraw + call assert_equal(normattr, screenattr(1, 1)) + diffthis + redraw + " no longer diffing with hidden buffer two + call assert_equal(normattr, screenattr(1, 1)) + + bwipe! + bwipe! + set hidden& diffopt& +endfunc + func Test_setting_cursor() new Xtest1 put =range(1,90) diff --git a/src/version.c b/src/version.c index fa51e56944..da53eb3cfc 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 300, +/**/ 299, /**/ 298, |