patch 7.4.1041

Problem:    Various small things.
Solution:   Add file to list of distributed files.  Adjust README.  Fix typo.

diff --git a/Filelist b/Filelist
index 4281c7c24df33c0b23fe9ecbf34b0ab2add9c17e..d58c53c7a6c0718f4ef2e3aa3da1a4a63ff1c5c8 100644 (file)
--- 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 d42c7c9bc7e31e9de0679d483da8dbd13bcc6a92..eb79d087c5fdf20e48c93555e1ee1735cdae49f6 100644 (file)
--- 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 5085cb39bc30e2780a328fa4a9f24f8fe4808081..df53107e0ecf25aa4208898ed80bb8b808c222d8 100644 (file)
--- 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 332bb91c19ffff61dfdc90d9415740b8283fbc46..ab777e394acea53591190f7ccf321f385756a8f4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1041,
 /**/
     1040,
 /**/