patch 7.4.2169
Problem: Startup test gets stuck on MS-Windows.
Solution: Use double quotes.
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index d0be241..056ecd9 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -135,7 +135,10 @@
let cmd = readfile('vimcmd')[0]
let cmd = substitute(cmd, '-u \f\+', '-u NONE', '')
- exe "silent !" . cmd . " --cmd 'so Xbefore.vim' -S Xafter.vim"
+ if cmd !~ '-u NONE'
+ let cmd = cmd . ' -u NONE'
+ endif
+ exe "silent !" . cmd . " --cmd \"so Xbefore.vim\" -S Xafter.vim"
call delete('Xbefore.vim')
call delete('Xafter.vim')
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 047bc34..14e78ce 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -19,6 +19,8 @@
return
endif
let before = [
+ \ 'set nocp viminfo+=nviminfo',
+ \ 'set guioptions+=M',
\ 'let $HOME = "/does/not/exist"',
\ 'set loadplugins',
\ 'set rtp=Xhere,Xafter',
diff --git a/src/version.c b/src/version.c
index 1b55e4f..e57e0fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2169,
+/**/
2168,
/**/
2167,
