diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-11-01 21:14:53 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-11-01 21:14:53 +0100 |
| commit | f7acf2b63ce91ea802dbcf0618f0cdee80993468 (patch) | |
| tree | 08f7c401390192d7905862f5a185b732117b9a2a /src | |
| parent | f080d70a82f3a4477f346d9efcdfaec1bc1e1d58 (diff) | |
| download | vim-git-f7acf2b63ce91ea802dbcf0618f0cdee80993468.tar.gz | |
patch 8.1.0503: missing change to diff testv8.1.0503
Problem: Missing change to diff test. (Hirohito Higashi)
Solution: Add the missing test function.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_diffmode.vim | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 22 insertions, 0 deletions
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 @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 503, +/**/ 502, /**/ 501, |