summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-03 22:16:20 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-03 22:16:20 +0100
commit022b896592721838e387e99fd785d3ded7b68be7 (patch)
tree35c9efef5a0b1ca3b6d76c02eab4f0497471ece9
parentfa7353428f705f7a13465a1943dddeede4083023 (diff)
downloadvim-git-022b896592721838e387e99fd785d3ded7b68be7.tar.gz
patch 7.4.1041v7.4.1041
Problem: Various small things. Solution: Add file to list of distributed files. Adjust README. Fix typo.
-rw-r--r--Filelist1
-rw-r--r--src/testdir/README.txt2
-rw-r--r--src/testdir/test_charsearch.in2
-rw-r--r--src/version.c2
4 files changed, 6 insertions, 1 deletions
diff --git a/Filelist b/Filelist
index 4281c7c24..d58c53c7a 100644
--- a/Filelist
+++ b/Filelist
@@ -703,6 +703,7 @@ EXTRA = \
runtime/vimlogo.xpm \
src/swis.s \
src/tee/Makefile \
+ src/tee/Make_mvc.mak \
src/tee/tee.c \
csdpmi4b.zip \
diff --git a/src/testdir/README.txt b/src/testdir/README.txt
index d42c7c9bc..eb79d087c 100644
--- a/src/testdir/README.txt
+++ b/src/testdir/README.txt
@@ -5,6 +5,8 @@ want to separate it from other tests in that file using :" (that's an Ex
command comment).
The numbered tests are older, we have switched to named tests.
+And the newest way of testing is to use assert functions, see test_assert.vim
+for an example.
To add a new test:
1) Create test_<subject>.in and test_<subject>.ok files.
diff --git a/src/testdir/test_charsearch.in b/src/testdir/test_charsearch.in
index 5085cb39b..df53107e0 100644
--- a/src/testdir/test_charsearch.in
+++ b/src/testdir/test_charsearch.in
@@ -10,7 +10,7 @@ ylfep;;p,,p:
ylfep:let csave = getcharsearch()
fip:call setcharsearch(csave)
;p;p:
-:" check that setcharsearch() changes the settins.
+:" check that setcharsearch() changes the settings.
/^Z
ylfep:call setcharsearch({'char': 'k'})
;p:call setcharsearch({'forward': 0})
diff --git a/src/version.c b/src/version.c
index 332bb91c1..ab777e394 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1041,
+/**/
1040,
/**/
1039,