From e13a3901cae0afb4d2af30d497696af08029fd81 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 27 Apr 2019 17:57:31 +0200
Subject: patch 8.1.1213: "make clean" in top dir does not cleanup indent test
 output

Problem:    "make clean" in top dir does not cleanup indent test output.
Solution:   Clean the indent test output.  Do not rely on the vim executable
            for that. (closes #4307)
---
 Makefile                             |  7 ++++++-
 runtime/indent/Makefile              |  2 +-
 runtime/indent/testdir/cleantest.vim | 11 -----------
 src/version.c                        |  2 ++
 4 files changed, 9 insertions(+), 13 deletions(-)
 delete mode 100644 runtime/indent/testdir/cleantest.vim

diff --git a/Makefile b/Makefile
index 16fc84ccdc..6ee3b1cdda 100644
--- a/Makefile
+++ b/Makefile
@@ -43,13 +43,18 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
 	@if test "$@" = "test"; then \
 		$(MAKE) indenttest; \
 	fi
+	@# When the target is "clean" also clean for the indent tests.
+	@if test "$@" = "clean" -o "$@" = "distclean" -o "$@" = "testclean"; then \
+		cd runtime/indent && \
+			$(MAKE) clean; \
+	fi
 
 # Executable used for running the indent tests.
 VIM_FOR_INDENTTEST = ../../src/vim
 
 indenttest:
 	cd runtime/indent && \
-		$(MAKE) clean VIM="$(VIM_FOR_INDENTTEST)" && \
+		$(MAKE) clean && \
 		$(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"
 		
 
diff --git a/runtime/indent/Makefile b/runtime/indent/Makefile
index 1917e46c6b..d192605527 100644
--- a/runtime/indent/Makefile
+++ b/runtime/indent/Makefile
@@ -11,4 +11,4 @@ test:
 
 
 clean:
-	VIMRUNTIME=$(VIMRUNTIME) $(VIM) --clean --not-a-term -u testdir/cleantest.vim
+	rm -f testdir/*.fail testdir/*.out
diff --git a/runtime/indent/testdir/cleantest.vim b/runtime/indent/testdir/cleantest.vim
deleted file mode 100644
index 69c0a1d4ba..0000000000
--- a/runtime/indent/testdir/cleantest.vim
+++ /dev/null
@@ -1,11 +0,0 @@
-" Only do this with the +eval feature
-if 1
-
-  " Deletes all the test output files: *.fail and *.out
-  for fname in glob('testdir/*.out', 1, 1) + glob('testdir/*.fail', 1, 1)
-    call delete(fname)
-  endfor
-
-endif
-
-quit
diff --git a/src/version.c b/src/version.c
index 704ff5482e..88763e5cfe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1213,
 /**/
     1212,
 /**/
-- 
cgit v1.2.3