From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-31076-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 8345 invoked by alias); 27 Feb 2013 21:57:34 -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: 31076
Received: (qmail 59 invoked from network); 27 Feb 2013 21:57:22 -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=-0.9 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED,
	DKIM_SIGNED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED,RCVD_IN_DNSWL_NONE,
	T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.2
Received-SPF: none (ns1.primenet.com.au: domain at yahoo.co.uk does not designate permitted sender hosts)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s1024; t=1362001914; bh=/Pt6MWxPd6g4wGg7s5xaOU2VXlmZCNa8e93M0xfRI/w=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Received:In-reply-to:From:References:To:Subject:MIME-Version:Content-Type:Content-ID:Date:Message-ID; b=U3LPOvK3eQ5IDuwQh3heZC+Tw3xMVyjxJBeXyjKmpmKQVCaLrXMwfo3XXLOtlBmk74IEbYRrjLc/KZ5hMo2mWQ+BNyisUWMkkl/POtmwDNDc1kTPv05wTxVTGrfVf7wG4kgO2jGnzBLLHevvN18K4D06ugbjNCOHCDvnY/joVRI=
X-Yahoo-Newman-Id: 534836.49096.bm@smtp139.mail.ird.yahoo.com
X-Yahoo-Newman-Property: ymail-3
X-YMail-OSG: Q_qMedEVM1mgoU.iRYRqQxKo0DulxtaiX6VobHReQ81hAea
 8r09XLUxMI3QR8dRncbiRtzQvo_d9ammrcilv5RkNFfDpnObyrUZoH3V1zZa
 hkyqq891vj6NHj29oXeldF8mto7pZXunH2h5CeG3eDbbSGmFm8GCosRM6p2P
 8Wxbf8xoA_AlaKlM7jsL6lnAS9YKgMh1zSmV639ApJfQ1Qnh5HqOWaUTE1sS
 U6CtWPfORRRjplyeqmk1s9qwzPRXTebIDACpY1u9qlNMVKq0qpKj.tBjjbus
 JougDRSPgVmDoOz93pwWxnPOjd86P9fUDKEs7cRe0Lqhp60ut3Qv9w3pjBFY
 PWd0Csh8xElKZg6b_Z7URiuRTvbCzC9hfJvO5Xm53tQEXnmfaIELyT7CbdBe
 4F9sL.ysSSJlo_0Ozc8fv4LCFnjDOxoi4Nnj_hML_GTvPgw--
X-Yahoo-SMTP: opAkk_CswBAce_kJ3nIPlH80cJI-
In-reply-to: <20235.1361979450@thecus.kiddle.eu>
From: Oliver Kiddle <okiddle@yahoo.co.uk>
References: <20235.1361979450@thecus.kiddle.eu>
To: Zsh workers <zsh-workers@zsh.org>
Subject: Re: completion function name clashes
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <23584.1362001821.1@thecus.kiddle.eu>
Date: Wed, 27 Feb 2013 22:51:53 +0100
Message-ID: <23594.1362001913@thecus.kiddle.eu>

We've also got a couple of cases of more than one function completing
for a specific command. There are two functions for yast. The patch
below is against the older one to make it complete .ycp files but I'll
move it to the opensuse directory.

Oliver

Index: Completion/Linux/Command/_yast
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Linux/Command/_yast,v
retrieving revision 1.1
diff -u -r1.1 _yast
--- Completion/Linux/Command/_yast	8 Jun 2005 12:12:42 -0000	1.1
+++ Completion/Linux/Command/_yast	27 Feb 2013 21:45:40 -0000
@@ -8,4 +8,4 @@
   '--noborder[no window manager border for main window]' \
   '--fullscreen[use full screen]' \
   '(-)'{-i,--install}'[install package]:*:package file:_files -g "*.rpm(-.)"' \
-  '1:module:( ${${(f)"$($words[1] -l 2>/dev/null)"}[2,-1]##* } )'
+  '1:module: _alternative files:file:_files\ -g\ \\\*.ycp\\\(-.\\\) modules:module:\(${${(f)"$($words[1] -l 2>/dev/null)"}[2,-1]##* }\)'
Index: Completion/Unix/Type/_pids
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Type/_pids,v
retrieving revision 1.5
diff -u -r1.5 _pids
--- Completion/Unix/Type/_pids	12 May 2011 15:57:02 -0000	1.5
+++ Completion/Unix/Type/_pids	27 Feb 2013 21:45:40 -0000
@@ -1,4 +1,4 @@
-#compdef pflags pcred pmap pldd psig pstack pfiles pwdx pstop prun pwait ptree
+#compdef pflags pcred pmap pldd psig pstack pfiles pwdx pstop prun pwait
 
 # If given the `-m <pattern>' option, this tries to complete only pids
 # of processes whose command line match the `<pattern>'.
Index: Completion/Unix/Type/_pdf
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Type/_pdf,v
retrieving revision 1.11
diff -u -r1.11 _pdf
--- Completion/Unix/Type/_pdf	6 Mar 2012 02:10:25 -0000	1.11
+++ Completion/Unix/Type/_pdf	27 Feb 2013 21:45:40 -0000
@@ -1,4 +1,4 @@
-#compdef pdf2dsc pdf2ps pdfimages pdfinfo pdftopbm pdftops pdftotext pdfopt pdffonts kpdf apvlv evince epdfview
+#compdef pdf2dsc pdf2ps pdfimages pdfinfo pdftopbm pdftops pdftotext pdfopt pdffonts kpdf apvlv epdfview
 
 local expl ext=''