To: vim_dev@googlegroups.com Subject: Patch 7.4.2294 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ 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. Files: src/testdir/test_signs.vim *** ../vim-7.4.2293/src/testdir/test_signs.vim 2016-08-17 22:29:06.158531366 +0200 --- src/testdir/test_signs.vim 2016-08-29 23:03:25.385276249 +0200 *************** *** 145,152 **** call feedkeys(":sign define Sign linehl=Spell\\\"\", 'tx') call assert_equal('"sign define Sign linehl=SpellBad SpellCap SpellLocal SpellRare', @:) ! call feedkeys(":sign define Sign icon=../../pixmaps/tb_p\\\"\", 'tx') ! call assert_equal('"sign define Sign icon=../../pixmaps/tb_paste.xpm ../../pixmaps/tb_print.xpm', @:) call feedkeys(":sign undefine \\\"\", 'tx') call assert_equal('"sign undefine Sign1 Sign2', @:) --- 145,156 ---- call feedkeys(":sign define Sign linehl=Spell\\\"\", 'tx') call assert_equal('"sign define Sign linehl=SpellBad SpellCap SpellLocal SpellRare', @:) ! call writefile(['foo'], 'XsignOne') ! call writefile(['bar'], 'XsignTwo') ! call feedkeys(":sign define Sign icon=Xsig\\\"\", 'tx') ! call assert_equal('"sign define Sign icon=XsignOne XsignTwo', @:) ! call delete('XsignOne') ! call delete('XsignTwo') call feedkeys(":sign undefine \\\"\", 'tx') call assert_equal('"sign undefine Sign1 Sign2', @:) *** ../vim-7.4.2293/src/version.c 2016-08-29 22:48:12.177105943 +0200 --- src/version.c 2016-08-29 23:05:36.964144542 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2294, /**/ -- hundred-and-one symptoms of being an internet addict: 109. You actually read -- and enjoy -- lists like this. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///