Permalink
Browse files

patch 7.4.2135

Problem:    Various tiny issues.
Solution:   Update comments, white space, etc.
  • Loading branch information...
1 parent b54c3ff commit 89eaa4185efacab253b23a182c1c8a7bbf1096c9 @brammool brammool committed Jul 31, 2016
Showing with 20 additions and 15 deletions.
  1. +1 −1 runtime/menu.vim
  2. +1 −1 src/INSTALLpc.txt
  3. +1 −1 src/diff.c
  4. +0 −1 src/digraph.c
  5. +8 −8 src/testdir/Makefile
  6. +2 −2 src/testdir/test80.in
  7. +1 −1 src/testdir/test_channel.vim
  8. +2 −0 src/version.c
  9. +4 −0 src/xpm/README.txt
View
@@ -2,7 +2,7 @@
" You can also use this as a start for your own set of menus.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2014 May 22
+" 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.
View
@@ -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.
View
@@ -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);
}
/*
View
@@ -2460,4 +2460,3 @@ keymap_unload(void)
}
#endif /* FEAT_KEYMAP */
-
View
@@ -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 \
@@ -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
@@ -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
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2135,
+/**/
2134,
/**/
2133,
View
@@ -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

0 comments on commit 89eaa41

Please sign in to comment.