To: vim_dev@googlegroups.com Subject: Patch 7.4.2169 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2169 (after 7.4.2168) Problem: Startup test gets stuck on MS-Windows. Solution: Use double quotes. Files: src/testdir/shared.vim, src/testdir/test_startup.vim *** ../vim-7.4.2168/src/testdir/shared.vim 2016-08-06 19:01:33.984856713 +0200 --- src/testdir/shared.vim 2016-08-06 21:35:01.992333493 +0200 *************** *** 135,141 **** let cmd = readfile('vimcmd')[0] let cmd = substitute(cmd, '-u \f\+', '-u NONE', '') ! exe "silent !" . cmd . " --cmd 'so Xbefore.vim' -S Xafter.vim" call delete('Xbefore.vim') call delete('Xafter.vim') --- 135,144 ---- let cmd = readfile('vimcmd')[0] let cmd = substitute(cmd, '-u \f\+', '-u NONE', '') ! if cmd !~ '-u NONE' ! let cmd = cmd . ' -u NONE' ! endif ! exe "silent !" . cmd . " --cmd \"so Xbefore.vim\" -S Xafter.vim" call delete('Xbefore.vim') call delete('Xafter.vim') *** ../vim-7.4.2168/src/testdir/test_startup.vim 2016-08-06 19:24:20.354036057 +0200 --- src/testdir/test_startup.vim 2016-08-06 21:30:14.814588745 +0200 *************** *** 19,24 **** --- 19,26 ---- return endif let before = [ + \ 'set nocp viminfo+=nviminfo', + \ 'set guioptions+=M', \ 'let $HOME = "/does/not/exist"', \ 'set loadplugins', \ 'set rtp=Xhere,Xafter', *** ../vim-7.4.2168/src/version.c 2016-08-06 20:36:28.731944156 +0200 --- src/version.c 2016-08-06 21:36:25.891674453 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2169, /**/ -- CRONE: Who sent you? ARTHUR: The Knights Who Say GNU! CRONE: Aaaagh! (she looks around in rear) No! We have no licenses here. "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE LTD /// 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 ///