From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-24525-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 945 invoked from network); 3 Feb 2008 06:48:21 -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=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 06:48:21 -0000
Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts)
Received: (qmail 79971 invoked from network); 3 Feb 2008 06:48:14 -0000
Received: from sunsite.dk (130.225.247.90)
  by a.mx.sunsite.dk with SMTP; 3 Feb 2008 06:48:14 -0000
Received: (qmail 21721 invoked by alias); 3 Feb 2008 06:48:11 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 24525
Received: (qmail 21707 invoked from network); 3 Feb 2008 06:48:10 -0000
Received: from bifrost.dotsrc.org (130.225.254.106)
  by sunsite.dk with SMTP; 3 Feb 2008 06:48:10 -0000
Received: from rv-out-0910.google.com (rv-out-0910.google.com [209.85.198.184])
	by bifrost.dotsrc.org (Postfix) with ESMTP id DA62A80482A1
	for <zsh-workers@sunsite.dk>; Sun,  3 Feb 2008 07:48:05 +0100 (CET)
Received: by rv-out-0910.google.com with SMTP id b22so1036006rvf.21
        for <zsh-workers@sunsite.dk>; Sat, 02 Feb 2008 22:48:03 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:received:received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition;
        bh=r4+87HGKt7/lrElMPdbZutzJy/d3hy7obyKJAGAKA3s=;
        b=RxRkH4kuLj6nYBlzcqnqp7jvCCwaSUkGuRDcaDTfW/ezagyqNnyV0Rth3zxZkE67lWxpCS7G5wZtb1d/tIvqXZgX2+5YkVSe9tn1i/u0emTC2DHxlY0zo21s0ClXg5rzpZJmZrN38EUdnPADywHwKhpQxuOe3l/jrIj7K/rWX7Y=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition;
        b=iyJgYQqe6Rw0I+CXwpm6qaijj7X2xMSaJM+c99dT9M5Zg3xpkEe2qDCge3mKGFMqioyKrqbjU04RtIRxof6XF6TjdBd39gxABeRzsEimtuxgXGT5c6gJJ8zJvP5T9VFLf3pABueXCzOr3mkBRtKXC2T0xYvJ0AYpkURpPHT/hCU=
Received: by 10.141.179.5 with SMTP id g5mr3740097rvp.76.1202021283909;
        Sat, 02 Feb 2008 22:48:03 -0800 (PST)
Received: by 10.141.202.18 with HTTP; Sat, 2 Feb 2008 22:48:03 -0800 (PST)
Message-ID: <237967ef0802022248k459943dboaaacb3163dc77ed1@mail.gmail.com>
Date: Sun, 3 Feb 2008 07:48:03 +0100
From: "Mikael Magnusson" <mikachu@gmail.com>
To: zsh-workers <zsh-workers@sunsite.dk>
Subject: gnu cut completion as wrong as it can be, patch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
X-Virus-Scanned: ClamAV 0.91.2/5665/Sun Feb  3 03:35:12 2008 on bifrost
X-Virus-Status: Clean

Add + qualifiers to short options that take arguments. Add said
arguments too. Remove a = from an option that does not take an
argument. Complete files (hello?).

diff --git a/Completion/Unix/Command/_cut b/Completion/Unix/Command/_cut
index 7d7526d..b17cf7c 100644
--- 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:' \


-- 
Mikael Magnusson