From 72846cfa76fb7e566c49282410163ed0840c91db Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 15 Dec 2018 17:23:18 +0100
Subject: [PATCH] patch 8.1.0598: indent tests may use the wrong Vim binary

Problem:    Indent tests may use the wrong Vim binary.
Solution:   Pass in the just built Vim binary.
---
 Makefile      | 14 +++++++++++---
 src/version.c |  2 ++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3e69d4501..2155b588a 100644
--- a/Makefile
+++ b/Makefile
@@ -39,10 +39,18 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
 	@echo "Starting make in the src directory."
 	@echo "If there are problems, cd to the src directory and run make there"
 	cd src && $(MAKE) $@
+	# When the target is "test" also run the indent tests.
+	@if test "$@" = "test"; then \
+		$(MAKE) indenttest; \
+	fi
+
+# Executable used for running the indent tests.
+VIM_FOR_INDENTTEST = ../../src/vim
 
-test: all
-	cd src && $(MAKE) test
-	cd runtime/indent && $(MAKE) clean && $(MAKE) test
+indenttest:
+	cd runtime/indent && \
+		$(MAKE) clean VIM="$(VIM_FOR_INDENTTEST)" && \
+		$(MAKE) test VIM="$(VIM_FOR_INDENTTEST)"
 		
 
 #########################################################################
diff --git a/src/version.c b/src/version.c
index a85295a6c..7e8b34efe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    598,
 /**/
     597,
 /**/
-- 
2.40.0