From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4284 invoked from network); 3 Feb 2008 18:08:14 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.4 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 3 Feb 2008 18:08:14 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 56901 invoked from network); 3 Feb 2008 18:08:00 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 3 Feb 2008 18:08:00 -0000 Received: (qmail 24649 invoked by alias); 3 Feb 2008 18:07:54 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 24527 Received: (qmail 24632 invoked from network); 3 Feb 2008 18:07:53 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 3 Feb 2008 18:07:53 -0000 Received: from acolyte.scowler.net (acolyte.scowler.net [216.254.112.45]) by bifrost.dotsrc.org (Postfix) with ESMTP id 7CB4D80482A1 for ; Sun, 3 Feb 2008 19:07:50 +0100 (CET) Received: by acolyte.scowler.net (Postfix, from userid 1000) id 6382D5C1A8; Sun, 3 Feb 2008 13:07:46 -0500 (EST) Date: Sun, 3 Feb 2008 13:07:47 -0500 From: Clint Adams To: Mikael Magnusson Cc: zsh-workers Subject: Re: gnu cut completion as wrong as it can be, patch Message-ID: <20080203180747.GA14836@scowler.net> Mail-Followup-To: Mikael Magnusson , zsh-workers References: <237967ef0802022248k459943dboaaacb3163dc77ed1@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.17+20080114 (2008-01-14) X-Virus-Scanned: ClamAV 0.91.2/5670/Sun Feb 3 15:33:19 2008 on bifrost X-Virus-Status: Clean On Sun, Feb 03, 2008 at 08:22:35AM +0100, Mikael Magnusson wrote: > Without linewrapping the patch... This won't apply, with or without -l. > --- a/Completion/Unix/Command/_cut > +++ b/Completion/Unix/Command/_cut > @@ -35,16 +35,17 @@ if _pick_variant gnu="Free Soft" unix --version; then > esac > > _arguments \ > - '(--bytes -b)'{--bytes=,-b}'['$_cut_args[bytes]']' \ > - '(--characters -c)'{--characters=,-c}'['$_cut_args[characters]']' \ > - '(--delimiter -d)'{--delimiter=,-d}'['$_cut_args[delimiter]']' \ > - '(--fields -f)'{--fields=,-f}'['$_cut_args[fields]']' \ > + '(--bytes -b+)'{--bytes=,-b}'['$_cut_args[bytes]']:list' \ > + '(--characters -c+)'{--characters=,-c}'['$_cut_args[characters]']:list' \ > + '(--delimiter -d+)'{--delimiter=,-d}'['$_cut_args[delimiter]']:delimeter' \ > + '(--fields -f+)'{--fields=,-f}'['$_cut_args[fields]']:list' \ > '-n['$_cut_args[n]']' \ > '--complement['$_cut_args[complement]']' \ > - '(--only-delimited -s)'{--only-delimited=,-s}'['$_cut_args[only-delimited]']' \ > - '--output-delimiter['$_cut_args[output-delimiter]']' \ > + '(--only-delimited -s)'{--only-delimited,-s}'['$_cut_args[only-delimited]']' \ > + '--output-delimiter=['$_cut_args[output-delimiter]']:delimeter' \ > '--help['$_cut_args[help]']' \ > - '--version['$_cut_args[version]']' > + '--version['$_cut_args[version]']' \ > + '*:file:_files' > else > _arguments \ > '-b[list specifies byte positions]:list:' \ I'm committing this; I'm not sure why you're putting + signs within the parentheses. Index: Completion/Unix/Command/_cut =================================================================== RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_cut,v retrieving revision 1.4 diff -u -r1.4 _cut --- Completion/Unix/Command/_cut 7 Dec 2007 17:03:32 -0000 1.4 +++ Completion/Unix/Command/_cut 3 Feb 2008 18:05:49 -0000 @@ -42,9 +42,10 @@ '-n['$_cut_args[n]']' \ '--complement['$_cut_args[complement]']' \ '(--only-delimited -s)'{--only-delimited=,-s}'['$_cut_args[only-delimited]']' \ - '--output-delimiter['$_cut_args[output-delimiter]']' \ + '--output-delimiter=['$_cut_args[output-delimiter]']' \ '--help['$_cut_args[help]']' \ - '--version['$_cut_args[version]']' + '--version['$_cut_args[version]']' \ + '*:file:_files' else _arguments \ '-b[list specifies byte positions]:list:' \