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 d0be24166a8ad3cfcdbe9fb1619d0cf78c553662..056ecd926b2e074d815dcfb8e4a7a0b6adddd328 100644 (file)
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -135,7 +135,10 @@ func RunVim(before, after)
 
   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 047bc34a2f2541b055422a11f77d8ea398b45cd0..14e78ce3c43d11c5297a43e1033b6828445aa1ef 100644 (file)
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -19,6 +19,8 @@ func Test_after_comes_later()
     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 1b55e4fba556685882adc2cd461a7a0f0f78274d..e57e0fc93155d6f496f6dae6e6eb7edf7d63d94a 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 */
+/**/
+    2169,
 /**/
     2168,
 /**/