Skip to content

Commit 446cce6

Browse files
committed
patch 7.4.2169
Problem: Startup test gets stuck on MS-Windows. Solution: Use double quotes.
1 parent 5b4a376 commit 446cce6

3 files changed

Lines changed: 8 additions & 1 deletion

File tree

src/testdir/shared.vim

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,10 @@ func RunVim(before, after)
135135

136136
let cmd = readfile('vimcmd')[0]
137137
let cmd = substitute(cmd, '-u \f\+', '-u NONE', '')
138-
exe "silent !" . cmd . " --cmd 'so Xbefore.vim' -S Xafter.vim"
138+
if cmd !~ '-u NONE'
139+
let cmd = cmd . ' -u NONE'
140+
endif
141+
exe "silent !" . cmd . " --cmd \"so Xbefore.vim\" -S Xafter.vim"
139142

140143
call delete('Xbefore.vim')
141144
call delete('Xafter.vim')

src/testdir/test_startup.vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ func Test_after_comes_later()
1919
return
2020
endif
2121
let before = [
22+
\ 'set nocp viminfo+=nviminfo',
23+
\ 'set guioptions+=M',
2224
\ 'let $HOME = "/does/not/exist"',
2325
\ 'set loadplugins',
2426
\ 'set rtp=Xhere,Xafter',

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ static char *(features[]) =
763763

764764
static int included_patches[] =
765765
{ /* Add new patch number below this line */
766+
/**/
767+
2169,
766768
/**/
767769
2168,
768770
/**/

0 commit comments

Comments
 (0)