aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/testdir/test_diffmode.vim40
1 files changed, 24 insertions, 16 deletions
diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim
index fe928c0f65..9829b6b654 100644
--- a/src/nvim/testdir/test_diffmode.vim
+++ b/src/nvim/testdir/test_diffmode.vim
@@ -1147,22 +1147,30 @@ func Test_diff_followwrap()
endfunc
func Test_diff_maintains_change_mark()
- enew!
- call setline(1, ['a', 'b', 'c', 'd'])
- diffthis
- new
- call setline(1, ['a', 'b', 'c', 'e'])
- " Set '[ and '] marks
- 2,3yank
- call assert_equal([2, 3], [line("'["), line("']")])
- " Verify they aren't affected by the implicit diff
- diffthis
- call assert_equal([2, 3], [line("'["), line("']")])
- " Verify they aren't affected by an explicit diff
- diffupdate
- call assert_equal([2, 3], [line("'["), line("']")])
- bwipe!
- bwipe!
+ func DiffMaintainsChangeMark()
+ enew!
+ call setline(1, ['a', 'b', 'c', 'd'])
+ diffthis
+ new
+ call setline(1, ['a', 'b', 'c', 'e'])
+ " Set '[ and '] marks
+ 2,3yank
+ call assert_equal([2, 3], [line("'["), line("']")])
+ " Verify they aren't affected by the implicit diff
+ diffthis
+ call assert_equal([2, 3], [line("'["), line("']")])
+ " Verify they aren't affected by an explicit diff
+ diffupdate
+ call assert_equal([2, 3], [line("'["), line("']")])
+ bwipe!
+ bwipe!
+ endfunc
+
+ set diffopt-=internal
+ call DiffMaintainsChangeMark()
+ set diffopt+=internal
+ call DiffMaintainsChangeMark()
+ set diffopt&
endfunc
func Test_diff_rnu()