Patch 8.1.2238

[Bram Moolenaar]

Patch 8.1.2238
Problem: Error in docs tags goes unnoticed.
Solution: Adjust tags build command. (Ken Takata, closes #5158)
Files: Filelist, .travis.yml, runtime/doc/Makefile,
runtime/doc/doctags.vim


*** ../vim-8.1.2237/Filelist 2019-10-19 18:37:37.373125818 +0200
--- Filelist 2019-11-01 19:43:12.520118393 +0100
***************
*** 663,668 ****
--- 663,669 ----
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 \
*** ../vim-8.1.2237/.travis.yml 2019-09-04 14:11:13.260990522 +0200
--- .travis.yml 2019-11-01 19:41:32.724531809 +0100
***************
*** 142,148 ****
"${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
- echo -en "${FOLD_MARKER}:end:test\\r\\033[0K"


--- 142,151 ----
"${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} &&
! make -C runtime/doc vimtags VIMEXE=../../"${SRCDIR}"/vim &&
! FOLD_MARKER=travis_fold
- echo -en "${FOLD_MARKER}:end:test\\r\\033[0K"


*** ../vim-8.1.2237/runtime/doc/Makefile 2019-07-21 16:39:56.196095894 +0200
--- runtime/doc/Makefile 2019-11-01 19:41:32.724531809 +0100
***************
*** 323,329 ****
# 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

# Use "doctags" to generate the tags file. Only works for English!
tags: doctags $(DOCS)
--- 323,329 ----
# Use Vim to generate the tags file. Can only be used when Vim has been
# compiled and installed. Supports multiple languages.
vimtags: $(DOCS)
! $(VIMEXE) -eX -u doctags.vim

# Use "doctags" to generate the tags file. Only works for English!
tags: doctags $(DOCS)
*** ../vim-8.1.2237/runtime/doc/doctags.vim 2019-11-01 19:45:41.227713352 +0100
--- runtime/doc/doctags.vim 2019-11-01 19:41:32.724531809 +0100
***************
*** 0 ****
--- 1,6 ----
+ " This script makes a tags file for help text.
+ "
+ " Usage: vim -eX -u doctags.vim
+
+ helptags ++t .
+ qa!
*** ../vim-8.1.2237/src/version.c 2019-10-31 19:55:47.516275360 +0100
--- src/version.c 2019-11-01 19:43:39.556050004 +0100
***************
*** 743,744 ****
--- 743,746 ----
{ /* Add new patch number below this line */
+ /**/
+ 2238,
/**/

--
hundred-and-one symptoms of being an internet addict:
25. You believe nothing looks sexier than a man in boxer shorts illuminated
only by a 17" inch svga monitor.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

[Tony Mechelynck]

On Fri, Nov 1, 2019 at 7:47 PM Bram Moolenaar <Br...@moolenaar.net> wrote:
> Patch 8.1.2238
> Problem: Error in docs tags goes unnoticed.
> Solution: Adjust tags build command. (Ken Takata, closes #5158)
> Files: Filelist, .travis.yml, runtime/doc/Makefile,
> runtime/doc/doctags.vim

Error (ignored) during "make install", as follows:

cd ../runtime/doc; if test -z "" -a -f tags; then \
mv -f tags tags.dist; fi
generating help tags
make[1]: Entering directory '/root/.build/vim/vim-hg/runtime/doc'
/usr/local/bin/vim -eX -u doctags.vim
Error detected while processing /root/.build/vim/vim-hg/runtime/doc/doctags.vim:
line 5:
E154: Duplicate tag "gm" in file ./motion.txt
.................. here a lot of empty lines ........................
make[1]: *** [Makefile:326: vimtags] Error 1
make[1]: Leaving directory '/root/.build/vim/vim-hg/runtime/doc'
make: [Makefile:2368: installrtbase] Error 2 (ignored)


I propose the attached patch to fix this problem.


Best regards,
Tony.

[Tony Mechelynck]

After the latest runtime files update, this problem has disappeared;
but helptags generation ("/usr/local/bin/vim -eX -u doctags.vim")
still outputs a large number of empty lines, which is annoying. Would
it please be possible to filter them out (maybe 2>&1 | egrep -v ^\s*$
or something)?

Best regards,
Tony.

[Bram Moolenaar]

Where do you see empty lines? I get no output at all:

$ cd vim/vim81/runtime/doc
$ vim -eX -u doctags.vim
$

--
hundred-and-one symptoms of being an internet addict:

28. You have comandeered your teenager's phone line for the net and even his
friends know not to call on his line anymore.

[Tony Mechelynck]

On Sat, Nov 2, 2019 at 6:14 PM Bram Moolenaar <Br...@moolenaar.net> wrote:
>
>
> Tony wrote:
>
> > After the latest runtime files update, this problem has disappeared;
> > but helptags generation ("/usr/local/bin/vim -eX -u doctags.vim")
> > still outputs a large number of empty lines, which is annoying. Would
> > it please be possible to filter them out (maybe 2>&1 | egrep -v ^\s*$
> > or something)?
>
> Where do you see empty lines? I get no output at all:
>
> $ cd vim/vim81/runtime/doc
> $ vim -eX -u doctags.vim
> $

Here is the relevant part of the output of "make installruntime",
including one line after the many empties:

generating help tags
make[1]: Entering directory '/root/.build/vim/vim-hg/runtime/doc'
/usr/local/bin/vim -eX -u doctags.vim

make[1]: Leaving directory '/root/.build/vim/vim-hg/runtime/doc'

Best regards,
Tony.

[Tony Mechelynck]

P.S. For some reason I don't see these many empty lines when running
"make install" after building with patch 8.1.2239.

Best regards,
Tony.

[Bram Moolenaar]

Tony wrote:

> > > After the latest runtime files update, this problem has disappeared;
> > > but helptags generation ("/usr/local/bin/vim -eX -u doctags.vim")
> > > still outputs a large number of empty lines, which is annoying. Would
> > > it please be possible to filter them out (maybe 2>&1 | egrep -v ^\s*$
> > > or something)?
> >
> > Where do you see empty lines? I get no output at all:
> >
> > $ cd vim/vim81/runtime/doc
> > $ vim -eX -u doctags.vim
> > $
>
> Here is the relevant part of the output of "make installruntime",
> including one line after the many empties:
>
> generating help tags
> make[1]: Entering directory '/root/.build/vim/vim-hg/runtime/doc'
> /usr/local/bin/vim -eX -u doctags.vim

[empty lines]

> make[1]: Leaving directory '/root/.build/vim/vim-hg/runtime/doc'

I don't see that. Can you try changing the line in
runtime/doc/Makefile:

vimtags: $(DOCS)
@if test -x $(VIMEXE); then $(VIMEXE) -eX -u doctags.vim; \
else echo "vim executable $(VIMEXE) not found"; fi

to:

vimtags: $(DOCS)
@if test -x $(VIMEXE); then $(VIMEXE) --clean -eX -u doctags.vim; \
else echo "vim executable $(VIMEXE) not found"; fi

Does it go away then?


--
Far out in the uncharted backwaters of the unfashionable end of the
Western Spiral arm of the Galaxy lies a small unregarded yellow sun.
Orbiting this at a distance of roughly ninety-eight million miles is an
utterly insignificant little blue-green planet whose ape-descended life
forms are so amazingly primitive that they still think digital watches
are a pretty neat idea ...
-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

[Tony Mechelynck]

No need. As I said earlier, your change 8.1.2239, putting the
$(VIMEXE) etc. command inside an "if" clause seems to have been
enough. If the problem doesn't reappear, I will assume that it was
solved at that point.

Best regards;
Tony.

[Tony Mechelynck]

I spoke too fast: the problem has reappeared, albeit with fewer empty
lines. Let me try with --clean added… success. (I did not rebuild
Vim).

For the record, I'm attaching the patch I applied.

Best regards,
Tony.