# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1560084308 -7200
# Node ID 9d9b637b35a99e69a8e54311a74427df9d53e6f5
# Parent  f595dee36579ae5b40a72c3f361ee21772b576f1
patch 8.1.1505: running "make clean" twice gives errors

commit https://github.com/vim/vim/commit/8ed75cb0b4d06b8c13dfb12bf3c54be0f6f0c71b
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sun Jun 9 14:39:13 2019 +0200

    patch 8.1.1505: running "make clean" twice gives errors

    Problem:    Running "make clean" twice gives errors.
    Solution:   Add "-f" to "rm". (closes https://github.com/vim/vim/issues/4516)

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -85,9 +85,9 @@ RUN_VIM = VIMRUNTIME=$(SCRIPTSOURCE); ex
 
 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
--- 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,