summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-11-03 18:38:47 +0100
committerBram Moolenaar <Bram@vim.org>2019-11-03 18:38:47 +0100
commite890b9f5dd3ae76e301b2df7f3151366acaba5dc (patch)
treeeebdcea905aa84b23d24dab0e059f48452d8e6da
parent1f068233c101ecf5966e6df14853fe68f08175a7 (diff)
downloadvim-git-8.1.2247.tar.gz
patch 8.1.2247: "make vimtags" does not work in runtime/docv8.1.2247
Problem: "make vimtags" does not work in runtime/doc. Solution: Test existence with "which" instead of "test -x". (Ken Takata)
-rw-r--r--runtime/doc/Makefile3
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index 0cbe02026..cec670bf3 100644
--- 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 5089d7d8b..62897987c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2247,
+/**/
2246,
/**/
2245,