Permalink
Browse files

patch 7.4.2169

Problem:    Startup test gets stuck on MS-Windows.
Solution:   Use double quotes.
  • Loading branch information...
1 parent 5b4a376 commit 446cce6d537b036467033975a86729dbdc83f860 @brammool brammool committed Aug 6, 2016
Showing with 8 additions and 1 deletion.
  1. +4 −1 src/testdir/shared.vim
  2. +2 −0 src/testdir/test_startup.vim
  3. +2 −0 src/version.c
@@ -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')
@@ -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',
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2169,
+/**/
2168,
/**/
2167,

0 comments on commit 446cce6

Please sign in to comment.