patch 8.1.2247: "make vimtags" does not work in runtime/doc

Problem:    "make vimtags" does not work in runtime/doc.
Solution:   Test existence with "which" instead of "test -x". (Ken Takata)

diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 0cbe0202600ee12b1a607207bf8739961fb34812..cec670bf35b7193331723975237cc31788ccbb4a 100644 (file)
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -323,7 +323,8 @@ 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)
-       @if test -x $(VIMEXE); then $(VIMEXE) --clean -eX -u doctags.vim; \
+       @if which $(VIMEXE) >/dev/null; then \
+               $(VIMEXE) --clean -eX -u doctags.vim >/dev/null; \
                else echo "vim executable $(VIMEXE) not found"; fi
 
 # Use "doctags" to generate the tags file.  Only works for English!

diff --git a/src/version.c b/src/version.c
index 5089d7d8b75861ae680da07b34b5d391cd2c34f1..62897987c5b1dfffa8a99aa7c5da908e07c09a2f 100644 (file)
--- 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 */
+/**/
+    2247,
 /**/
     2246,
 /**/