Skip to content

Commit

Permalink
patch 8.1.2238: error in docs tags goes unnoticed
Browse files Browse the repository at this point in the history
Problem:    Error in docs tags goes unnoticed.
Solution:   Adjust tags build command. (Ken Takata, closes vim#5158)
  • Loading branch information
brammool committed Nov 1, 2019
1 parent 7a641ca commit 757bd2e
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down
1 change: 1 addition & 0 deletions Filelist
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion runtime/doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions runtime/doc/doctags.vim
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
" This script makes a tags file for help text.
"
" Usage: vim -eX -u doctags.vim

helptags ++t .
qa!
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
2238,
/**/
2237,
/**/
Expand Down

0 comments on commit 757bd2e

Please sign in to comment.