diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-12-12 23:26:51 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-12-28 14:57:39 -0500 |
| commit | 552cc4d0b3c9ebfd7ca30bfac71fab4ee5d9188e (patch) | |
| tree | 155b4c7481af642b67004e5dd2fed5a770a1a6e4 | |
| parent | de025d6dd05de41a1226721420ffa51018e07fed (diff) | |
| download | rneovim-552cc4d0b3c9ebfd7ca30bfac71fab4ee5d9188e.tar.gz rneovim-552cc4d0b3c9ebfd7ca30bfac71fab4ee5d9188e.tar.bz2 rneovim-552cc4d0b3c9ebfd7ca30bfac71fab4ee5d9188e.zip | |
vim-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.
https://github.com/vim/vim/commit/64cefedfc834aa4dac54ae5f91ccbc04e2d56bc5
| -rw-r--r-- | src/nvim/testdir/test_signs.vim | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_signs.vim b/src/nvim/testdir/test_signs.vim index 93cc62cd9c..75dbd74b34 100644 --- a/src/nvim/testdir/test_signs.vim +++ b/src/nvim/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/nvim/version.c b/src/nvim/version.c index 9e555d1694..d06741f1b6 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -146,7 +146,7 @@ static int included_patches[] = { // 2297 NA // 2296, // 2295, - // 2294, + 2294, // 2293, // 2292, // 2291, |