summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-06-09 14:39:13 +0200
committerBram Moolenaar <Bram@vim.org>2019-06-09 14:39:13 +0200
commit8ed75cb0b4d06b8c13dfb12bf3c54be0f6f0c71b (patch)
tree5c2fa918336fd52435d82b85c8f3c07ee7b0bfb2 /src
parentef23c527bd0abe4770dce14559aac3e5f79a8e17 (diff)
downloadvim-git-8ed75cb0b4d06b8c13dfb12bf3c54be0f6f0c71b.tar.gz
patch 8.1.1505: running "make clean" twice gives errorsv8.1.1505
Problem: Running "make clean" twice gives errors. Solution: Add "-f" to "rm". (closes #4516)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/Makefile6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index bf64a0383..d3c1184e8 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -85,9 +85,9 @@ RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); export VIMRUNTIME; $(VALGRIND) $(VIMPROG)
clean:
-rm -rf *.out *.failed *.res *.rej *.orig
- -rm opt_test.vim test.log test_result.log messages
- -rm $(RM_ON_RUN) $(RM_ON_START)
- -rm valgrind.*
+ -rm -f opt_test.vim test.log test_result.log messages
+ -rm -f $(RM_ON_RUN) $(RM_ON_START)
+ -rm -f valgrind.*
test1.out: test1.in
-rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START) wrongtermsize
diff --git a/src/version.c b/src/version.c
index 82e9e3842..13db30461 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1505,
+/**/
1504,
/**/
1503,