To: vim_dev@googlegroups.com Subject: Patch 7.4.2135 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2135 Problem: Various tiny issues. Solution: Update comments, white space, etc. Files: src/diff.c, src/digraph.c, src/testdir/test80.in, src/testdir/test_channel.vim, src/testdir/Makefile, runtime/menu.vim, src/INSTALLpc.txt, src/xpm/README.txt *** ../vim-7.4.2134/src/diff.c 2016-07-24 21:58:39.692057745 +0200 --- src/diff.c 2016-07-30 15:44:05.524788642 +0200 *************** *** 135,141 **** return; } ! EMSGN(_("E96: Can not diff more than %ld buffers"), DB_COUNT); } /* --- 135,141 ---- return; } ! EMSGN(_("E96: Cannot diff more than %ld buffers"), DB_COUNT); } /* *** ../vim-7.4.2134/src/digraph.c 2016-03-12 22:11:34.247300195 +0100 --- src/digraph.c 2016-07-01 17:19:41.432102604 +0200 *************** *** 2460,2463 **** } #endif /* FEAT_KEYMAP */ - --- 2460,2462 ---- *** ../vim-7.4.2134/src/testdir/test80.in 2014-04-02 19:00:53.043644100 +0200 --- src/testdir/test80.in 2016-07-19 18:08:57.698525180 +0200 *************** *** 1,5 **** ! Test for *sub-replace-special* and *sub-replace-expression* on substitue(). ! Test for submatch() on substitue(). Test for *:s%* on :substitute. STARTTEST --- 1,5 ---- ! Test for *sub-replace-special* and *sub-replace-expression* on substitute(). ! Test for submatch() on substitute(). Test for *:s%* on :substitute. STARTTEST *** ../vim-7.4.2134/src/testdir/test_channel.vim 2016-07-23 14:01:11.393652479 +0200 --- src/testdir/test_channel.vim 2016-07-23 20:14:32.989110919 +0200 *************** *** 1320,1326 **** 1,$delete call job_start('cat test_channel.vim', {'out_io': 'buffer', 'out_name': 'testout'}) call WaitFor('line("$") > g:linecount') ! call assert_true(line('$') > g:linecount) bwipe! endfunc --- 1320,1326 ---- 1,$delete call job_start('cat test_channel.vim', {'out_io': 'buffer', 'out_name': 'testout'}) call WaitFor('line("$") > g:linecount') ! call assert_inrange(g:linecount + 1, g:linecount + 2, line('$')) bwipe! endfunc *** ../vim-7.4.2134/src/testdir/Makefile 2016-05-28 13:40:06.586644700 +0200 --- src/testdir/Makefile 2016-07-30 23:12:55.820223748 +0200 *************** *** 80,93 **** @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1" -$(RUN_VIM) $*.in ! # For flaky tests retry one time. ! @/bin/sh -c "if test -f test.out -a $* = test61; then \ ! if diff test.out $*.ok; \ ! then echo flaky test ok first time; \ ! else rm -rf $*.failed $(RM_ON_RUN); \ ! $(RUN_VIM) $*.in; \ ! fi \ ! fi" # Check if the test.out file matches test.ok. @/bin/sh -c "if test -f test.out; then \ --- 80,93 ---- @-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1" -$(RUN_VIM) $*.in ! # For flaky tests retry one time. No tests at the moment. ! #@/bin/sh -c "if test -f test.out -a $* = test61; then \ ! # if diff test.out $*.ok; \ ! # then echo flaky test ok first time; \ ! # else rm -rf $*.failed $(RM_ON_RUN); \ ! # $(RUN_VIM) $*.in; \ ! # fi \ ! # fi" # Check if the test.out file matches test.ok. @/bin/sh -c "if test -f test.out; then \ *** ../vim-7.4.2134/runtime/menu.vim 2016-07-16 14:46:51.119240709 +0200 --- runtime/menu.vim 2016-07-27 20:57:47.934986036 +0200 *************** *** 2,8 **** " You can also use this as a start for your own set of menus. " " Maintainer: Bram Moolenaar ! " Last Change: 2014 May 22 " Note that ":an" (short for ":anoremenu") is often used to make a menu work " in all modes and avoid side effects from mappings defined by the user. --- 2,8 ---- " You can also use this as a start for your own set of menus. " " Maintainer: Bram Moolenaar ! " Last Change: 2016 Jul 27 " Note that ":an" (short for ":anoremenu") is often used to make a menu work " in all modes and avoid side effects from mappings defined by the user. *** ../vim-7.4.2134/src/INSTALLpc.txt 2016-04-21 14:34:46.936894196 +0200 --- src/INSTALLpc.txt 2016-06-11 14:05:31.042784629 +0200 *************** *** 49,55 **** VS2010, VS2012, VS2013 and VS2015) is straightforward. (These instructions should also work for VS 4 and VS 5.) ! Using VS C++ 2008 Express is recommended, the binaries build with that run on nearly all platforms. Binaries from later versions may not run on Windows 95 or XP. --- 49,55 ---- VS2010, VS2012, VS2013 and VS2015) is straightforward. (These instructions should also work for VS 4 and VS 5.) ! Using VS C++ 2008 Express is recommended, the binaries built with that run on nearly all platforms. Binaries from later versions may not run on Windows 95 or XP. *** ../vim-7.4.2134/src/xpm/README.txt 2012-09-05 17:35:34.000000000 +0200 --- src/xpm/README.txt 2016-06-19 10:26:12.014085685 +0200 *************** *** 4,9 **** --- 4,13 ---- Libraries in x86 directory were compiled with MSVC6 and MinGW. Proposed commands to compile Vim are: + If you want to build XPM library by yourself, you may want to use the + following Win32 port: + https://github.com/koron/libXpm-win32 + Any version of MSVC starting from version 6.0: nmake -f Make_mvc.mak GUI=yes CSCOPE=yes NETBEANS=yes XPM=e:\hg\xpm\x86 *** ../vim-7.4.2134/src/version.c 2016-07-31 14:11:55.182542334 +0200 --- src/version.c 2016-07-31 14:15:34.984503047 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2135, /**/ -- Why is "abbreviation" such a long word? /// 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 ///