1
0
forked from aniani/vim

patch 8.2.3936: no proper test for maintaining change mark in diff mode

Problem:    No proper test for maintaining change mark in diff mode.
Solution:   Run the test with internal and external diff. (Sean Dewar,
            closes #9424)
This commit is contained in:
Sean Dewar 2021-12-29 16:44:48 +00:00 committed by Bram Moolenaar
parent 5d20fbf2e7
commit ccc1644f95
2 changed files with 26 additions and 16 deletions

View File

@ -1189,22 +1189,30 @@ func Test_diff_followwrap()
endfunc endfunc
func Test_diff_maintains_change_mark() func Test_diff_maintains_change_mark()
enew! func DiffMaintainsChangeMark()
call setline(1, ['a', 'b', 'c', 'd']) enew!
diffthis call setline(1, ['a', 'b', 'c', 'd'])
new diffthis
call setline(1, ['a', 'b', 'c', 'e']) new
" Set '[ and '] marks call setline(1, ['a', 'b', 'c', 'e'])
2,3yank " Set '[ and '] marks
call assert_equal([2, 3], [line("'["), line("']")]) 2,3yank
" Verify they aren't affected by the implicit diff call assert_equal([2, 3], [line("'["), line("']")])
diffthis " Verify they aren't affected by the implicit diff
call assert_equal([2, 3], [line("'["), line("']")]) diffthis
" Verify they aren't affected by an explicit diff call assert_equal([2, 3], [line("'["), line("']")])
diffupdate " Verify they aren't affected by an explicit diff
call assert_equal([2, 3], [line("'["), line("']")]) diffupdate
bwipe! call assert_equal([2, 3], [line("'["), line("']")])
bwipe! bwipe!
bwipe!
endfunc
set diffopt-=internal
call DiffMaintainsChangeMark()
set diffopt+=internal
call DiffMaintainsChangeMark()
set diffopt&
endfunc endfunc
" Test for 'patchexpr' " Test for 'patchexpr'

View File

@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3936,
/**/ /**/
3935, 3935,
/**/ /**/