# HG changeset patch # User Bram Moolenaar # Date 1572634804 -3600 # Node ID 5b95ccb82c0a40200e87ba6b07455e6dfaa31f22 # Parent 9d887cad731520b4b75cbcd533f138d3b90e7276 patch 8.1.2238: error in docs tags goes unnoticed Commit: https://github.com/vim/vim/commit/757bd2ea49585ea9896d6df707c68b4793017039 Author: Bram Moolenaar Date: Fri Nov 1 19:46:22 2019 +0100 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 https://github.com/vim/vim/issues/5158) diff --git a/.travis.yml b/.travis.yml --- 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 --- 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 --- a/runtime/doc/Makefile +++ b/runtime/doc/Makefile @@ -323,7 +323,7 @@ all: tags vim.man evim.man vimdiff.man v # 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 --- /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 --- 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 */ /**/ + 2238, +/**/ 2237, /**/ 2236,