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 26e7b9f..da6a3f6 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -36,19 +36,20 @@
call mkdir('Xafter/plugin', 'p')
call writefile(['let done = 1'], 'Xafter/plugin/later.vim')
- call RunVim(before, after)
+ 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
+ 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 142801d..e3ecd93 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2165,
+/**/
2164,
/**/
2163,
