Merge remote commit

2 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 1f5bf6e64..5533c5c7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,13 @@
 	* Martin Vaeth: 31959: .gitignore, Doc/help/.cvsignore,
 	Doc/help/.distfiles: missed files.
 
+2013-11-12  Bart Schaefer  <schaefer@zsh.org>
+
+	* 31966: Util/helpfiles: skip introductory paragraphs processing
+	"man zshbuiltins" by assuming that all real command names start
+	with a lower case letter.  Check "ztcp" file as a guess that all
+	builtins were processed.
+
 2013-11-12  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* Martin Vaeth: 31959: .gitignore,
diff --git a/Util/helpfiles b/Util/helpfiles
index 530bb15af..ba1c50a38 100755
--- a/Util/helpfiles
+++ b/Util/helpfiles
@@ -123,7 +123,7 @@ $print = 0;
 
 sub namesub {
     local($cmd) = shift;
-    if ($cmd =~ /^\w+$/) {
+    if ($cmd =~ /^\w*$/ && lc($cmd) eq $cmd) {
 	$cmd;
     } elsif ($cmd eq '.') {
 	'dot';
@@ -261,6 +261,6 @@ foreach $file (<*>) {
 close(LINKFILE) unless($linkfile eq '');
 
 # Make one sanity check
-&Die('not all files were properly generated') unless(-r 'zmodload');
+&Die('not all files were properly generated') unless(-r 'ztcp');
 
 __END__