From 49959a35df8d22d8ccb5fc9ef726953d5ae7f891 Mon Sep 17 00:00:00 2001
From: Martin Vaeth <vaeth@mathematik.uni-wuerzburg.de>
Date: Mon, 18 Nov 2013 10:06:33 -0800
Subject: 32008: complete "." and ":" for run-help, clean Doc/help in make

---
 ChangeLog                         | 5 +++++
 Completion/Zsh/Command/.distfiles | 1 +
 Completion/Zsh/Command/_run-help  | 2 +-
 Doc/Makefile.in                   | 5 +++--
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 26bc3d44e..d2a847066 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
 
 2013-11-18  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* 32008: Martin Vaeth: Completion/Zsh/Command/.distfiles
+	Completion/Zsh/Command/_run-help Doc/Makefile.in: follow-up to
+	31988 - complete "." and ":" for run-help, distribute _run-help,
+	clean up better during make
+
 	* 31995: Han Pingtian: Src/glob.c: glob	qualifiers cannot
 	follow an empty pattern, so a leading paren means grouping
 
diff --git a/Completion/Zsh/Command/.distfiles b/Completion/Zsh/Command/.distfiles
index 6feec496d..bf780a2a0 100644
--- a/Completion/Zsh/Command/.distfiles
+++ b/Completion/Zsh/Command/.distfiles
@@ -22,6 +22,7 @@ _precommand
 _print
 _prompt
 _read
+_run-help
 _sched
 _set
 _setopt
diff --git a/Completion/Zsh/Command/_run-help b/Completion/Zsh/Command/_run-help
index b579d9711..786ad3785 100644
--- a/Completion/Zsh/Command/_run-help
+++ b/Completion/Zsh/Command/_run-help
@@ -3,5 +3,5 @@ local d expl
 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
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index 51b5c5ced..5893cc832 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -187,10 +187,10 @@ man: $(MAN)
 
 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 @@ distclean-here: clean-here
 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@
-- 
cgit 1.4.1