patch 7.4.2165

Problem:    Startup test fails on MS-Windows.
Solution:   Don't check output if RunVim() returns zero.

diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 26e7b9f8eec2e6f0192967ae5e4a45f89f241a74..da6a3f6f80983042d7be1a0e65e20a848fbbd187 100644 (file)
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -36,19 +36,20 @@ func Test_after_comes_later()
   call mkdir('Xafter/plugin', 'p')
   call writefile(['let done = 1'], 'Xafter/plugin/later.vim')
 
-  call RunVim(before, after)
-
-  let lines = readfile('Xtestout')
-  let expected = ['Xbefore.vim', 'here.vim', 'foo.vim', 'later.vim', 'Xafter.vim']
-  let found = []
-  for line in lines
-    for one in expected
-      if line =~ one
-       call add(found, one)
-      endif
+  if RunVim(before, after)
+
+    let lines = readfile('Xtestout')
+    let expected = ['Xbefore.vim', 'here.vim', 'foo.vim', 'later.vim', 'Xafter.vim']
+    let found = []
+    for line in lines
+      for one in expected
+       if line =~ one
+         call add(found, one)
+       endif
+      endfor
     endfor
-  endfor
-  call assert_equal(expected, found)
+    call assert_equal(expected, found)
+  endif
 
   call delete('Xtestout')
   call delete('Xhere', 'rf')

diff --git a/src/version.c b/src/version.c
index 142801db42bb45f698b8cd4f2e1506dcdd524403..e3ecd93c7640ceb51b245c0a06a81e625c12aad5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2165,
 /**/
     2164,
 /**/