]> granicus.if.org Git - vim/commitdiff
patch 8.1.0503: missing change to diff test v8.1.0503
authorBram Moolenaar <Bram@vim.org>
Thu, 1 Nov 2018 20:14:53 +0000 (21:14 +0100)
committerBram Moolenaar <Bram@vim.org>
Thu, 1 Nov 2018 20:14:53 +0000 (21:14 +0100)
Problem:    Missing change to diff test. (Hirohito Higashi)
Solution:   Add the missing test function.

src/testdir/test_diffmode.vim
src/version.c

index 6a8bea0ec52e6cefda1984afade19f7f1a7870f3..4f20395ab1f1a796c548dc5084edf65a4f76fdde 100644 (file)
@@ -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
index d2bed0e5d49c9a124516efaeecdb5518bf30e063..bc22e73da1af84ef516b630ef41ac22268f4e565 100644 (file)
@@ -792,6 +792,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    503,
 /**/
     502,
 /**/