Skip to content

Commit f7acf2b

Browse files
committed
patch 8.1.0503: missing change to diff test
Problem: Missing change to diff test. (Hirohito Higashi) Solution: Add the missing test function.
1 parent f080d70 commit f7acf2b

2 files changed

Lines changed: 22 additions & 0 deletions

File tree

src/testdir/test_diffmode.vim

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -885,3 +885,23 @@ func Test_diff_with_cursorline()
885885
call StopVimInTerminal(buf)
886886
call delete('Xtest_diff_cursorline')
887887
endfunc
888+
889+
func Test_diff_of_diff()
890+
if !CanRunVimInTerminal()
891+
return
892+
endif
893+
894+
call writefile([
895+
\ 'call setline(1, ["aa","bb","cc","@@ -3,2 +5,7 @@","dd","ee","ff"])',
896+
\ 'vnew',
897+
\ 'call setline(1, ["aa","bb","cc"])',
898+
\ 'windo diffthis',
899+
\ ], 'Xtest_diff_diff')
900+
let buf = RunVimInTerminal('-S Xtest_diff_diff', {})
901+
902+
call VerifyScreenDump(buf, 'Test_diff_of_diff_01', {})
903+
904+
" clean up
905+
call StopVimInTerminal(buf)
906+
call delete('Xtest_diff_diff')
907+
endfunc

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -792,6 +792,8 @@ static char *(features[]) =
792792

793793
static int included_patches[] =
794794
{ /* Add new patch number below this line */
795+
/**/
796+
503,
795797
/**/
796798
502,
797799
/**/

0 commit comments

Comments
 (0)