# HG changeset patch # User Bram Moolenaar # Date 1541103306 -3600 # Node ID 28fde4aa8534db319610138cce6296e01a903e48 # Parent 3bc0e905b50747e84425680b187d796490622b34 patch 8.1.0503: missing change to diff test commit https://github.com/vim/vim/commit/f7acf2b63ce91ea802dbcf0618f0cdee80993468 Author: Bram Moolenaar Date: Thu Nov 1 21:14:53 2018 +0100 patch 8.1.0503: missing change to diff test Problem: Missing change to diff test. (Hirohito Higashi) Solution: Add the missing test function. diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim --- a/src/testdir/test_diffmode.vim +++ b/src/testdir/test_diffmode.vim @@ -885,3 +885,23 @@ func Test_diff_with_cursorline() call StopVimInTerminal(buf) call delete('Xtest_diff_cursorline') endfunc + +func Test_diff_of_diff() + if !CanRunVimInTerminal() + return + endif + + call writefile([ + \ 'call setline(1, ["aa","bb","cc","@@ -3,2 +5,7 @@","dd","ee","ff"])', + \ 'vnew', + \ 'call setline(1, ["aa","bb","cc"])', + \ 'windo diffthis', + \ ], 'Xtest_diff_diff') + let buf = RunVimInTerminal('-S Xtest_diff_diff', {}) + + call VerifyScreenDump(buf, 'Test_diff_of_diff_01', {}) + + " clean up + call StopVimInTerminal(buf) + call delete('Xtest_diff_diff') +endfunc diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 503, +/**/ 502, /**/ 501,