From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-31966-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 27221 invoked by alias); 13 Nov 2013 02:40:22 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 31966
Received: (qmail 15261 invoked from network); 13 Nov 2013 02:40:16 -0000
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE
	autolearn=ham version=3.3.2
From: Bart Schaefer <schaefer@brasslantern.com>
Message-id: <131112184016.ZM27796@torch.brasslantern.com>
Date: Tue, 12 Nov 2013 18:40:16 -0800
In-reply-to: <131112171320.ZM27752@torch.brasslantern.com>
Comments: In reply to Bart Schaefer <schaefer@brasslantern.com>
 "Re: Install run-help and *.zwc files system wide in build system" (Nov 12,
 5:13pm)
References: <slrnl7uiji.iif.vaeth@lounge.imp.fu-berlin.de>
	<20131110181333.7682d38f@pws-pc.ntlworld.com>
	<alpine.DEB.2.02.1311102256480.22248@lounge.imp.fu-berlin.de>
	<131110183043.ZM21795@torch.brasslantern.com>
	<slrnl817mv.72r.vaeth@bois.imp.fu-berlin.de>
	<131111084228.ZM26372@torch.brasslantern.com>
	<slrnl82ob8.634.vaeth@lounge.imp.fu-berlin.de>
	<20131112101139.31d67b73@pwslap01u.europe.root.pri>
	<slrnl84q2v.cbd.vaeth@lounge.imp.fu-berlin.de>
	<20131112174805.26ecab48@pwslap01u.europe.root.pri>
	<20131112210424.177c035b@pws-pc.ntlworld.com>
	<slrnl858pj.ehc.vaeth@lounge.imp.fu-berlin.de>
	<131112171320.ZM27752@torch.brasslantern.com>
X-Mailer: OpenZMail Classic (0.9.2 24April2005)
To: zsh-workers@zsh.org
Subject: Re: Install run-help and *.zwc files system wide in build system
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii

On Nov 12,  5:13pm, Bart Schaefer wrote:
}
} Was it intentional that this creates files Doc/help/{All,Options,Some},
} or is that an accident of slightly-obsolete parsing in the old helpfiles
} script?

The latter.  Util/helpfiles wasn't expecting the introductory text at the
beginning of the section, which was only added about a month ago.

The simplest thing is just to discard the introductory text (patch below).
The only other thing to do would be to add another heading after those
introductory paragraphs, and stash the text in between in some made-up
file name; already, Util/helpfiles anticipates a header "DESCRIPTIONS"
even though there isn't one.


diff --git a/Util/helpfiles b/Util/helpfiles
index 530bb15..ba1c50a 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__