summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-01 17:49:44 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-01 17:49:44 +0100
commit7eae47af89580df07a72079405a0e7b8aad784a8 (patch)
tree6127d9929e12a5cd547351ab4081859413ad8f49
parent40a346dc19a75f2be1b2d491053487cf365dd7d4 (diff)
patch 7.4.1020v7.4.1020
Problem: On MS-Windows there is no target to run tests with gvim. Solution: Add the testgvim target.
-rw-r--r--src/Make_mvc.mak5
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index c5c0a1220a..ebbe2797c1 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -1027,6 +1027,11 @@ test:
$(MAKE) /NOLOGO -f Make_dos.mak win32
cd ..
+testgvim:
+ cd testdir
+ $(MAKE) /NOLOGO -f Make_dos.mak VIMPROG=..\gvim win32
+ cd ..
+
testclean:
cd testdir
$(MAKE) /NOLOGO -f Make_dos.mak clean
diff --git a/src/version.c b/src/version.c
index 70c54aa47d..a2eded595a 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 */
/**/
+ 1020,
+/**/
1019,
/**/
1018,