summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-11-07 22:13:32 +0100
committerBram Moolenaar <Bram@vim.org>2016-11-07 22:13:32 +0100
commit3f9ebf32a392a9cae1c3e4b6bf8cecad60e2a22a (patch)
treefd5c94fbe83cb1e10e789370e0875141004da393 /src
parenta1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660 (diff)
downloadvim-git-3f9ebf32a392a9cae1c3e4b6bf8cecad60e2a22a.tar.gz
patch 8.0.0070v8.0.0070
Problem: Tests referred in Makefile that no longer exist. Solution: Remove test71 and test74 entries. (Michael Soyka)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/Make_ming.mak2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 33306910a..ab6a60b92 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -68,7 +68,7 @@ win32: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests
fixff:
-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=dos|upd" +q *.in *.ok
-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=unix|upd" +q \
- dotest.in test60.ok test71.ok test74.ok test_listchars.ok \
+ dotest.in test60.ok test_listchars.ok \
test_getcwd.ok test_wordcount.ok
clean:
diff --git a/src/version.c b/src/version.c
index c698e446b..19a22f325 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 70,
+/**/
69,
/**/
68,