patch 7.4.1026

Problem:    When using MingW the tests do not clean up all files.  E.g. test
            17 leaves Xdir1 behind. (Michael Soyka)
Solution:   Also delete directories, like Make_dos.mak.  Delete files after
            directories to reduce warnings.

Author: brammool

src/testdir/Make_dos.mak

@@ -51,10 +51,10 @@ $(TEST_OUTFILES): $(DOSTMP)\$(*B).in
 	$(VIMPROG) -u dos.vim -U NONE --noplugin -s dotest.in $(*B).in
 	-@if exist test.out MOVE /y test.out $(DOSTMP)\$(*B).out
 	-@if exist $(*B).in.bak move /y $(*B).in.bak $(*B).in
-	-@del X*
 	-@if exist test.ok del test.ok
 	-@if exist Xdir1 rd /s /q Xdir1
 	-@if exist Xfind rd /s /q Xfind
+	-@del X*
 	-@if exist viminfo del viminfo
 	$(VIMPROG) -u dos.vim --noplugin "+set ff=unix|f test.out|wq" \
 		$(DOSTMP)\$(*B).out
@@ -87,9 +87,9 @@ clean:
 	-if exist mbyte.vim del mbyte.vim
 	-if exist mzscheme.vim del mzscheme.vim
 	-if exist lua.vim del lua.vim
-	-del X*
 	-if exist Xdir1 rd /s /q Xdir1
 	-if exist Xfind rd /s /q Xfind
+	-del X*
 	-if exist viminfo del viminfo
 	-if exist test.log del test.log
 	-if exist messages del messages

src/testdir/Make_ming.mak

@@ -10,12 +10,14 @@
 
 ifneq (sh.exe, $(SHELL))
 DEL = rm -f
+DELDIR = rm -rf
 MV = mv
 CP = cp
 CAT = cat
 DIRSLASH = /
 else
 DEL = del
+DELDIR = rd /s /q
 MV = rename
 CP = copy
 CAT = type
@@ -76,6 +78,8 @@ clean:
 	-$(DEL) mbyte.vim
 	-$(DEL) mzscheme.vim
 	-$(DEL) lua.vim
+	-$(DELDIR) Xdir1
+	-$(DELDIR) Xfind
 	-$(DEL) X*
 	-$(DEL) viminfo
 
@@ -85,6 +89,8 @@ clean:
 	diff test.out $*.ok
 	-$(DEL) $*.out
 	$(MV) test.out $*.out
+	-$(DELDIR) Xdir1
+	-$(DELDIR) Xfind
 	-$(DEL) X*
 	-$(DEL) test.ok
 	-$(DEL) viminfo

src/version.c

@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1026,
 /**/
     1025,
 /**/