thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/testdir/test_diffmode.vim
View File

@ -1189,6 +1189,7 @@ func Test_diff_followwrap()
endfunc endfunc
func Test_diff_maintains_change_mark() func Test_diff_maintains_change_mark()
func DiffMaintainsChangeMark()
enew! enew!
call setline(1, ['a', 'b', 'c', 'd']) call setline(1, ['a', 'b', 'c', 'd'])
diffthis diffthis
@ -1205,6 +1206,13 @@ func Test_diff_maintains_change_mark()
call assert_equal([2, 3], [line("'["), line("']")]) call assert_equal([2, 3], [line("'["), line("']")])
bwipe! bwipe!
bwipe! bwipe!
endfunc
set diffopt-=internal
call DiffMaintainsChangeMark()
set diffopt+=internal
call DiffMaintainsChangeMark()
set diffopt&
endfunc endfunc
" Test for 'patchexpr' " Test for 'patchexpr'

2
src/version.c
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,
/**/ /**/