From f7acf2b63ce91ea802dbcf0618f0cdee80993468 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 1 Nov 2018 21:14:53 +0100 Subject: patch 8.1.0503: missing change to diff test Problem: Missing change to diff test. (Hirohito Higashi) Solution: Add the missing test function. --- src/testdir/test_diffmode.vim | 20 ++++++++++++++++++++ src/version.c | 2 ++ 2 files changed, 22 insertions(+) (limited to 'src') diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim index 6a8bea0ec..4f20395ab 100644 --- 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 index d2bed0e5d..bc22e73da 100644 --- a/src/version.c +++ b/src/version.c @@ -792,6 +792,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 503, /**/ 502, /**/ -- cgit v1.2.1