Mercurial > vim

changeset 14984:28fde4aa8534

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0503: missing change to diff test commit https://github.com/vim/vim/commit/f7acf2b63ce91ea802dbcf0618f0cdee80993468 Author: Bram Moolenaar <Bram@vim.org> 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.
author Bram Moolenaar <Bram@vim.org>
date Thu, 01 Nov 2018 21:15:06 +0100
parents 3bc0e905b507
children 4ebda55537a5
files src/testdir/test_diffmode.vim src/version.c
diffstat 2 files changed, 22 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,