Re: modify functions hierarchy (was: Install run-help and *.zwc files system wide in build system)

[Martin Vaeth <vaeth@xxxxxxxxxxxxxxxxxxxxxxxxxxx>]

Independently of how this discussion turns out, the
previous patch I sent also contained some other fixes
which should be applied in any case:

The fix for _run-help, the improved sanity check for help/* creation,
and the 2 missing Doc/help/.* files.

Moreover, since currently _run-help is not treated as an
intermediate file, it should be added to .distfiles, since
otherwise it will not be in the tarball at all.

Finally, as mentioned in another post, code for cleaning Doc/help*
(when cleaning *.1 files) was missing.

The attached patch contains all these minor fixes.
Please be aware to remove the two Doc/help/.* files manually (if you
already created them locally) before applying the patch: otherwise the
content of these files will be duplicated after the patch.

Before committing to git, please do not forget to add these 2 Doc/help/.*
files...

--- 1/Completion/Zsh/Command/.distfiles
+++ 1/Completion/Zsh/Command/.distfiles
@@ -22,6 +22,7 @@
 _print
 _prompt
 _read
+_run-help
 _sched
 _set
 _setopt
--- 1/Completion/Zsh/Command/_run-help
+++ 1/Completion/Zsh/Command/_run-help
@@ -3,5 +3,5 @@
 local HELPDIR=${HELPDIR:-/usr/share/zsh/$ZSH_VERSION/help}
 [[ -d $HELPDIR ]] && {
 	d=($HELPDIR/*(:t))
-	(($#d)) && _wanted commands expl 'command' compadd -a d
+	(($#d)) && d+=('.' ':') && _wanted commands expl 'command' compadd -a d
 } || _man
--- 1/Doc/Makefile.in
+++ 1/Doc/Makefile.in
@@ -187,10 +187,10 @@
 
 runhelp: man
 	test x"$(runhelpdir)" = x"" || { \
-	    test -r $(sdir)/help.txt && test -r $(sdir)/help/zmodload; \
+	    test -r $(sdir)/help.txt && test -r $(sdir)/help/ztcp; \
 	} || perl $(sdir_top)/Util/helpfiles \
 	    $(sdir)/zshbuiltins.1 $(sdir)/help $(sdir)/help.txt \
-	    || { rm -f $(sdir)/help.txt $(sdir)/help/zmodload; false; }
+	    || { rm -f $(sdir)/help.txt $(sdir)/help/*; false; }
 .PHONY: runhelp
 
 $(MAN): zmacros.yo zman.yo
@@ -396,6 +396,7 @@
 realclean-here: distclean-here
 	cd $(sdir) && rm -f Zsh/modlist.yo Zsh/modmenu.yo Zsh/manmodmenu.yo
 	cd $(sdir) && rm -f version.yo ../META-FAQ zsh.texi $(MAN)
+	cd $(sdir) && rm -f help.txt help/*
 .PHONY: realclean-here
 
 @CLEAN_MK@
--- 1/Doc/help/.cvsignore
+++ 1/Doc/help/.cvsignore
@@ -0,0 +1 @@
+[_a-zA-Z0-9]*
--- 1/Doc/help/.distfiles
+++ 1/Doc/help/.distfiles
@@ -0,0 +1,4 @@
+DISTFILES_SRC='
+    .cvsignore .distfiles
+    [_a-zA-Z0-9]*
+'