patch 7.4.1115

Problem:    MS-Windows: make clean in testdir doesn't clean everything.
Solution:   Add command to delete X* directories. (Ken Takata)

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 47f9d222304ebe7ec683d1c7a8dbbd08711d1fe5..480993087a22a114a048750fb0222f86fcf7831e 100644 (file)
--- 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 571cb682cf2bae9565cc6c90c53c91e78dc7469e..4e23c616142964f4e2187cea9480308bfa3af9f1 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 */
+/**/
+    1115,
 /**/
     1114,
 /**/