To: vim_dev@googlegroups.com Subject: Patch 7.4.2184 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2184 Problem: Tests that use RunVim() do not actually perform the test. Solution: Use "return" instead of "call". (Ken Takata) Files: src/testdir/shared.vim *** ../vim-7.4.2183/src/testdir/shared.vim 2016-08-07 18:22:30.426091047 +0200 --- src/testdir/shared.vim 2016-08-08 22:32:28.575298784 +0200 *************** *** 130,136 **** " Plugins are not loaded, unless 'loadplugins' is set in "before". " Return 1 if Vim could be executed. func RunVim(before, after, arguments) ! call RunVimPiped(a:before, a:after, a:arguments, '') endfunc func RunVimPiped(before, after, arguments, pipecmd) --- 130,136 ---- " Plugins are not loaded, unless 'loadplugins' is set in "before". " Return 1 if Vim could be executed. func RunVim(before, after, arguments) ! return RunVimPiped(a:before, a:after, a:arguments, '') endfunc func RunVimPiped(before, after, arguments, pipecmd) *** ../vim-7.4.2183/src/version.c 2016-08-08 22:26:37.993926379 +0200 --- src/version.c 2016-08-08 22:33:23.786885179 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2184, /**/ -- Git catch 22: "merge is not possible because you have unmerged files." /// 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 ///