From 757bd2ea49585ea9896d6df707c68b4793017039 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 1 Nov 2019 19:46:22 +0100
Subject: [PATCH] patch 8.1.2238: error in docs tags goes unnoticed

Problem:    Error in docs tags goes unnoticed.
Solution:   Adjust tags build command. (Ken Takata, closes #5158)
---
 .travis.yml             | 5 ++++-
 Filelist                | 1 +
 runtime/doc/Makefile    | 2 +-
 runtime/doc/doctags.vim | 6 ++++++
 src/version.c           | 2 ++
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 runtime/doc/doctags.vim

diff --git a/.travis.yml b/.travis.yml
index 4625bcf9d..f96564bd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -142,7 +142,10 @@ script:
       "${SRCDIR}"/vim --not-a-term -u NONE -S "${SRCDIR}"/testdir/if_ver-2.vim -c quit > /dev/null
       cat if_ver.txt
     fi
-  - do_test make ${SHADOWOPT} ${TEST} && FOLD_MARKER=travis_fold
+  - >
+    do_test make ${SHADOWOPT} ${TEST} &&
+    make -C runtime/doc vimtags VIMEXE=../../"${SRCDIR}"/vim &&
+    FOLD_MARKER=travis_fold
   - echo -en "${FOLD_MARKER}:end:test\\r\\033[0K"
 
 
diff --git a/Filelist b/Filelist
index a2b9f0adb..6cb5f63b2 100644
--- a/Filelist
+++ b/Filelist
@@ -663,6 +663,7 @@ RT_ALL =	\
 		runtime/doc/*.txt \
 		runtime/doc/Makefile \
 		runtime/doc/doctags.c \
+		runtime/doc/doctags.vim \
 		runtime/doc/test_urls.vim \
 		runtime/doc/vim.1 \
 		runtime/doc/evim.1 \
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 4a1ea03fd..443a27a61 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -323,7 +323,7 @@ all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
 # Use Vim to generate the tags file.  Can only be used when Vim has been
 # compiled and installed.  Supports multiple languages.
 vimtags: $(DOCS)
-	$(VIMEXE) -u NONE -esX -c "helptags ++t ." -c quit
+	$(VIMEXE) -eX -u doctags.vim
 
 # Use "doctags" to generate the tags file.  Only works for English!
 tags: doctags $(DOCS)
diff --git a/runtime/doc/doctags.vim b/runtime/doc/doctags.vim
new file mode 100644
index 000000000..7dfbcc0ad
--- /dev/null
+++ b/runtime/doc/doctags.vim
@@ -0,0 +1,6 @@
+" This script makes a tags file for help text.
+"
+" Usage: vim -eX -u doctags.vim
+
+helptags ++t .
+qa!
diff --git a/src/version.c b/src/version.c
index 3eaf21fa3..e1d5c6460 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2238,
 /**/
     2237,
 /**/
-- 
2.50.1