summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-09-13 21:01:22 +0200
committerBram Moolenaar <Bram@vim.org>2020-09-13 21:01:22 +0200
commit05c1acd5e1564ea4dbc7d4be26908af6909f43f6 (patch)
treec8a607d0e07e71a710423e67094c46056b00e77a
parentf0afd9e18227d3459c888584d0658a1837d2aaf8 (diff)
patch 8.2.1675: MinGW: testdir makefile deletes non-existing filev8.2.1675
Problem: MinGW: testdir makefile deletes non-existing file. Solution: Use another way to delete the output file if it already exists. (Michael Soyka)
-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 f9dcfc86e0..5e17963c5e 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -95,7 +95,7 @@ tinytests: $(SCRIPTS_TINY_OUT)
# Copy the input files to dostmp, changing the fileformat to dos.
$(DOSTMP)/%.in : %.in
if not exist $(DOSTMP)\nul mkdir $(DOSTMP)
- if not exist $@ $(DEL) $@
+ if exist $(DOSTMP)\$< $(DEL) $(DOSTMP)\$<
$(VIMPROG) -u dos.vim $(NO_INITS) "+set ff=dos|f $@|wq" $<
# For each input file dostmp/test99.in run the tests.
diff --git a/src/version.c b/src/version.c
index 503c6ead01..57acd28f22 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1675,
+/**/
1674,
/**/
1673,