diff options
| author | James McCoy <jamessan@jamessan.com> | 2019-12-15 21:17:16 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2019-12-15 21:17:16 -0500 |
| commit | 6566251d144d2c9c9e08e05c8c3a3fe9915a19b8 (patch) | |
| tree | 980fd0c7287e295c8ac72858b0794f72224415e0 /src/nvim/testdir/test_diffmode.vim | |
| parent | 9c4223215f71e1212462ada4e698be1b31437dd9 (diff) | |
| parent | 9f3d483c79f03c48239fdc82cc02e8685a03d22a (diff) | |
| download | rneovim-6566251d144d2c9c9e08e05c8c3a3fe9915a19b8.tar.gz rneovim-6566251d144d2c9c9e08e05c8c3a3fe9915a19b8.tar.bz2 rneovim-6566251d144d2c9c9e08e05c8c3a3fe9915a19b8.zip | |
Merge remote-tracking branch 'upstream/master' into libcall
Diffstat (limited to 'src/nvim/testdir/test_diffmode.vim')
| -rw-r--r-- | src/nvim/testdir/test_diffmode.vim | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim index 57b19aa817..21e0271bda 100644 --- a/src/nvim/testdir/test_diffmode.vim +++ b/src/nvim/testdir/test_diffmode.vim @@ -773,3 +773,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 |