diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/INSTALLpc.txt | 2 | ||||
| -rw-r--r-- | src/diff.c | 2 | ||||
| -rw-r--r-- | src/digraph.c | 1 | ||||
| -rw-r--r-- | src/testdir/Makefile | 16 | ||||
| -rw-r--r-- | src/testdir/test80.in | 4 | ||||
| -rw-r--r-- | src/testdir/test_channel.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/xpm/README.txt | 4 |
8 files changed, 19 insertions, 14 deletions
diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt index bc1fa36e0..c77204e7d 100644 --- a/src/INSTALLpc.txt +++ b/src/INSTALLpc.txt @@ -49,7 +49,7 @@ Building with Visual Studio (VS 98, VS .NET, VS .NET 2003, VS 2005, VS 2008, 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 +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. diff --git a/src/diff.c b/src/diff.c index 35e37d750..c29e94437 100644 --- a/src/diff.c +++ b/src/diff.c @@ -135,7 +135,7 @@ diff_buf_add(buf_T *buf) return; } - EMSGN(_("E96: Can not diff more than %ld buffers"), DB_COUNT); + EMSGN(_("E96: Cannot diff more than %ld buffers"), DB_COUNT); } /* diff --git a/src/digraph.c b/src/digraph.c index b17340cb2..4d86b9c7b 100644 --- a/src/digraph.c +++ b/src/digraph.c @@ -2460,4 +2460,3 @@ keymap_unload(void) } #endif /* FEAT_KEYMAP */ - diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 129ecaf6c..5c629ed3f 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -80,14 +80,14 @@ test1.out: test1.in @-/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" + # 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 \ diff --git a/src/testdir/test80.in b/src/testdir/test80.in index 406fb6dac..e78e92118 100644 --- a/src/testdir/test80.in +++ b/src/testdir/test80.in @@ -1,5 +1,5 @@ -Test for *sub-replace-special* and *sub-replace-expression* on substitue(). -Test for submatch() on substitue(). +Test for *sub-replace-special* and *sub-replace-expression* on substitute(). +Test for submatch() on substitute(). Test for *:s%* on :substitute. STARTTEST diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 48ab69c75..fff9ebd6c 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -1320,7 +1320,7 @@ func Test_collapse_buffers() 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) + call assert_inrange(g:linecount + 1, g:linecount + 2, line('$')) bwipe! endfunc diff --git a/src/version.c b/src/version.c index 8ef6dec48..210c2e4c0 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2135, +/**/ 2134, /**/ 2133, diff --git a/src/xpm/README.txt b/src/xpm/README.txt index 586de6c81..25f3831eb 100644 --- a/src/xpm/README.txt +++ b/src/xpm/README.txt @@ -4,6 +4,10 @@ This is XPM library compiled for Windows which is intended for use with Vim 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 |