diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-08-29 23:06:28 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-08-29 23:06:28 +0200 |
| commit | 64cefedfc834aa4dac54ae5f91ccbc04e2d56bc5 (patch) | |
| tree | 239baaf8a2d9c1d1691a094c719657592a83625e | |
| parent | edf3f97ae2af024708ebb4ac614227327033ca47 (diff) | |
| download | vim-git-64cefedfc834aa4dac54ae5f91ccbc04e2d56bc5.tar.gz | |
patch 7.4.2294v7.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.
| -rw-r--r-- | src/testdir/test_signs.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/testdir/test_signs.vim b/src/testdir/test_signs.vim index 93cc62cd9..75dbd74b3 100644 --- a/src/testdir/test_signs.vim +++ b/src/testdir/test_signs.vim @@ -145,8 +145,12 @@ func Test_sign_completion() call feedkeys(":sign define Sign linehl=Spell\<C-A>\<C-B>\"\<CR>", 'tx') call assert_equal('"sign define Sign linehl=SpellBad SpellCap SpellLocal SpellRare', @:) - call feedkeys(":sign define Sign icon=../../pixmaps/tb_p\<C-A>\<C-B>\"\<CR>", 'tx') - call assert_equal('"sign define Sign icon=../../pixmaps/tb_paste.xpm ../../pixmaps/tb_print.xpm', @:) + call writefile(['foo'], 'XsignOne') + call writefile(['bar'], 'XsignTwo') + call feedkeys(":sign define Sign icon=Xsig\<C-A>\<C-B>\"\<CR>", 'tx') + call assert_equal('"sign define Sign icon=XsignOne XsignTwo', @:) + call delete('XsignOne') + call delete('XsignTwo') call feedkeys(":sign undefine \<C-A>\<C-B>\"\<CR>", 'tx') call assert_equal('"sign undefine Sign1 Sign2', @:) diff --git a/src/version.c b/src/version.c index dde3828fb..d881342b1 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2294, +/**/ 2293, /**/ 2292, |