Skip to content

Commit 64cefed

Browse files
committed
patch 7.4.2294
Problem: Sign test fails on MS-Windows when using the distributed zip archives. Solution: Create dummy files instead of relying on files in the pixmaps directory.
1 parent edf3f97 commit 64cefed

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

src/testdir/test_signs.vim

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,12 @@ func Test_sign_completion()
145145
call feedkeys(":sign define Sign linehl=Spell\<C-A>\<C-B>\"\<CR>", 'tx')
146146
call assert_equal('"sign define Sign linehl=SpellBad SpellCap SpellLocal SpellRare', @:)
147147

148-
call feedkeys(":sign define Sign icon=../../pixmaps/tb_p\<C-A>\<C-B>\"\<CR>", 'tx')
149-
call assert_equal('"sign define Sign icon=../../pixmaps/tb_paste.xpm ../../pixmaps/tb_print.xpm', @:)
148+
call writefile(['foo'], 'XsignOne')
149+
call writefile(['bar'], 'XsignTwo')
150+
call feedkeys(":sign define Sign icon=Xsig\<C-A>\<C-B>\"\<CR>", 'tx')
151+
call assert_equal('"sign define Sign icon=XsignOne XsignTwo', @:)
152+
call delete('XsignOne')
153+
call delete('XsignTwo')
150154

151155
call feedkeys(":sign undefine \<C-A>\<C-B>\"\<CR>", 'tx')
152156
call assert_equal('"sign undefine Sign1 Sign2', @:)

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+
2294,
766768
/**/
767769
2293,
768770
/**/

0 commit comments

Comments
 (0)