summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-17 16:15:32 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-17 16:15:32 +0100
commitd0232917ced39ff4838665fbcf379d5116a91aa3 (patch)
tree2d95ef9232b74581afe5f6f1216f802ebf56634c
parent43a34f9f74fdce462fa250baab620264c28b6165 (diff)
patch 7.4.1115v7.4.1115
Problem: MS-Windows: make clean in testdir doesn't clean everything. Solution: Add command to delete X* directories. (Ken Takata)
-rw-r--r--src/testdir/Make_dos.mak1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 47f9d22230..480993087a 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -89,6 +89,7 @@ clean:
-if exist Xdir1 rd /s /q Xdir1
-if exist Xfind rd /s /q Xfind
-del X*
+ -for /d %i in (X*) do @rmdir /s/q %i
-if exist viminfo del viminfo
-if exist test.log del test.log
-if exist messages del messages
diff --git a/src/version.c b/src/version.c
index 571cb682cf..4e23c61614 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 */
/**/
+ 1115,
+/**/
1114,
/**/
1113,