From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25652 invoked from network); 27 Jul 2004 21:11:47 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 27 Jul 2004 21:11:47 -0000 Received: (qmail 53916 invoked from network); 27 Jul 2004 21:11:39 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 27 Jul 2004 21:11:39 -0000 Received: (qmail 2144 invoked by alias); 27 Jul 2004 21:11:19 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 20200 Received: (qmail 2128 invoked from network); 27 Jul 2004 21:11:19 -0000 Received: from unknown (HELO a.mx.sunsite.dk) (130.225.247.88) by 130.225.247.90 with SMTP; 27 Jul 2004 21:11:19 -0000 Received: (qmail 40511 invoked from network); 27 Jul 2004 21:08:01 -0000 Received: from lhuumrelay3.lnd.ops.eu.uu.net (62.189.58.19) by a.mx.sunsite.dk with SMTP; 27 Jul 2004 21:07:59 -0000 Received: from MAILSWEEPER01.csr.com (mailhost1.csr.com [62.189.183.235]) by lhuumrelay3.lnd.ops.eu.uu.net (8.11.0/8.11.0) with ESMTP id i6R9Etv02123 for ; Tue, 27 Jul 2004 09:14:56 GMT Received: from EXCHANGE02.csr.com (unverified [192.168.137.45]) by MAILSWEEPER01.csr.com (Content Technologies SMTPRS 4.3.12) with ESMTP id for ; Tue, 27 Jul 2004 10:14:09 +0100 Received: from news01.csr.com ([192.168.143.38]) by EXCHANGE02.csr.com with Microsoft SMTPSVC(5.0.2195.6713); Tue, 27 Jul 2004 10:16:43 +0100 Received: from news01.csr.com (localhost.localdomain [127.0.0.1]) by news01.csr.com (8.12.11/8.12.11) with ESMTP id i6R9EpVr013271 for ; Tue, 27 Jul 2004 10:14:51 +0100 Received: from csr.com (pws@localhost) by news01.csr.com (8.12.11/8.12.11/Submit) with ESMTP id i6R9EpRA013268 for ; Tue, 27 Jul 2004 10:14:51 +0100 Message-Id: <200407270914.i6R9EpRA013268@news01.csr.com> X-Authentication-Warning: news01.csr.com: pws owned process doing -bs To: zsh-workers@sunsite.dk (Zsh hackers list) Subject: Re: PATCH: kfmclient and MIME type completion In-reply-to: "Oliver Kiddle"'s message of "Mon, 26 Jul 2004 17:29:55 +0200." <8123.1090855795@trentino.logica.co.uk> Date: Tue, 27 Jul 2004 10:14:50 +0100 From: Peter Stephenson X-OriginalArrivalTime: 27 Jul 2004 09:16:43.0606 (UTC) FILETIME=[6EF7C760:01C473BA] X-Spam-Checker-Version: SpamAssassin 2.63 on a.mx.sunsite.dk X-Spam-Level: X-Spam-Status: No, hits=-4.9 required=6.0 tests=BAYES_00 autolearn=no version=2.63 X-Spam-Hits: -4.9 Oliver Kiddle wrote: > Peter wrote: > > > +# This is the same style as used by zsh-mime-setup, with a different > > +# context. > > +if zstyle -a ":completion:${curcontext}:mime" mime-types type_files; then > > Why do you use `mime' as the tag? It should either be empty or the same > as the tag used when adding matches (such as mime-types). It depends which part of the completion system you believe. This was an echo of the way it's done in zsh-mime-setup. I do think it's cleaner without a tag, though. > > +[[ $state = *arg ]] || return 1 > > + > > +# Argument to previous command. > > + > > +print $line >/tmp/tmp.out > > That looks like remnant debug which we won't want. I can see how you might think that. Index: Completion/Unix/Type/_mime_types =================================================================== RCS file: /cvsroot/zsh/zsh/Completion/Unix/Type/_mime_types,v retrieving revision 1.1 diff -u -r1.1 _mime_types --- Completion/Unix/Type/_mime_types 26 Jul 2004 16:59:54 -0000 1.1 +++ Completion/Unix/Type/_mime_types 27 Jul 2004 09:11:18 -0000 @@ -8,7 +8,7 @@ # This is the same style as used by zsh-mime-setup, with a different # context. -if zstyle -a ":completion:${curcontext}:mime" mime-types type_files; then +if zstyle -a ":completion:${curcontext}:" mime-types type_files; then while (( (ind = ${type_files[(I)+]}) > 0 )); do type_files[$ind]=($default_type_files) done @@ -31,12 +31,12 @@ # Search for subtype. maintype=$match[1] compset -p $(( ${#maintype} + 1 )) - _wanted mimesubtype expl 'MIME subtype' \ + _wanted mime-subtypes expl 'MIME subtype' \ compadd -- $(sed -ne "s%^\(type=\|\)${maintype}/\([^ ]*\).*$%\2%p" \ $type_files) else # Search for main type. - _wanted mimetype expl 'MIME type' \ + _wanted mime-types expl 'MIME type' \ compadd -S/ -- $(sed -ne "s/^type=//" \ -e "s%^\(${PREFIX:-[a-z]}[^=\"]*\)/.*$%\1%p" $type_files) fi Index: Completion/X/Command/_kfmclient =================================================================== RCS file: /cvsroot/zsh/zsh/Completion/X/Command/_kfmclient,v retrieving revision 1.1 diff -u -r1.1 _kfmclient --- Completion/X/Command/_kfmclient 26 Jul 2004 16:59:54 -0000 1.1 +++ Completion/X/Command/_kfmclient 27 Jul 2004 09:11:18 -0000 @@ -54,8 +54,6 @@ # Argument to previous command. -print $line >/tmp/tmp.out - case $line[1] in (openURL) if [[ $state = secondarg ]]; then -- Peter Stephenson Software Engineer CSR Ltd., Science Park, Milton Road, Cambridge, CB4 0WH, UK Tel: +44 (0)1223 692070 ********************************************************************** This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the system manager. This footnote also confirms that this email message has been swept by MIMEsweeper for the presence of computer viruses. www.mimesweeper.com **********************************************************************