diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-10 21:00:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-10 21:00:27 +0100 |
| commit | c8234779790dd873acb88331c50988adf94cc383 (patch) | |
| tree | d3e58b31d9e4593956cd028e4468051ce3d79dfc /src/testdir/test_diffmode.vim | |
| parent | 5c6b6187ac51a4d8545e823c1be6cdf70cac8a57 (diff) | |
patch 8.1.2289: after :diffsplit closing the window does not disable diffv8.1.2289
Problem: After :diffsplit closing the window does not disable diff.
Solution: Add "closeoff" to 'diffopt' and add it to the default.
Diffstat (limited to 'src/testdir/test_diffmode.vim')
| -rw-r--r-- | src/testdir/test_diffmode.vim | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index 8ad86ada8f..6f4eaaf431 100644 --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -964,3 +964,28 @@ func Test_diff_of_diff() call StopVimInTerminal(buf) call delete('Xtest_diff_diff') endfunc + +func CloseoffSetup() + enew + call setline(1, ['one', 'two', 'three']) + diffthis + new + call setline(1, ['one', 'tow', 'three']) + diffthis + call assert_equal(1, &diff) + only! +endfunc + +func Test_diff_closeoff() + " "closeoff" included by default: last diff win gets 'diff' reset' + call CloseoffSetup() + call assert_equal(0, &diff) + enew! + + " "closeoff" excluded: last diff win keeps 'diff' set' + set diffopt-=closeoff + call CloseoffSetup() + call assert_equal(1, &diff) + diffoff! + enew! +endfunc |