From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29797 invoked from network); 22 Aug 2003 10:20:57 -0000 Received: from sunsite.dk (130.225.247.90) by ns1.primenet.com.au with SMTP; 22 Aug 2003 10:20:57 -0000 Received: (qmail 3965 invoked by alias); 22 Aug 2003 10:20:50 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 18959 Received: (qmail 3956 invoked from network); 22 Aug 2003 10:20:50 -0000 Received: from localhost (HELO sunsite.dk) (127.0.0.1) by localhost with SMTP; 22 Aug 2003 10:20:50 -0000 X-MessageWall-Score: 0 (sunsite.dk) Received: from [62.189.183.235] by sunsite.dk (MessageWall 1.0.8) with SMTP; 22 Aug 2003 10:20:49 -0000 Received: from EXCHANGE02.csr.com (unverified) by MAILSWEEPER01.cambridgesiliconradio.com (Content Technologies SMTPRS 4.3.10) with ESMTP id for ; Fri, 22 Aug 2003 11:19:45 +0100 Received: from csr.com ([192.168.144.127]) by EXCHANGE02.csr.com with Microsoft SMTPSVC(5.0.2195.5329); Fri, 22 Aug 2003 11:22:25 +0100 To: zsh-workers@sunsite.dk (Zsh hackers list) Subject: PATCH: Yet another _perforce options patch Date: Fri, 22 Aug 2003 11:20:36 +0100 Message-ID: <3359.1061547636@csr.com> From: Peter Stephenson X-OriginalArrivalTime: 22 Aug 2003 10:22:25.0879 (UTC) FILETIME=[484BE670:01C36897] Felix pointed out that completion of global options doesn't take into account existing options properly. Also now offers to complete the default port 1666. Index: Completion/Unix/Command/_perforce =================================================================== RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_perforce,v retrieving revision 1.12 diff -u -r1.12 _perforce --- Completion/Unix/Command/_perforce 21 Aug 2003 18:27:19 -0000 1.12 +++ Completion/Unix/Command/_perforce 22 Aug 2003 10:16:38 -0000 @@ -273,8 +273,11 @@ # end of the arguments list, anyway. for (( i = 2; i < CURRENT; i++ )); do if [[ $words[i] = -[$argopts_pass$argopts_ignore] ]]; then - # word with following argument - if [[ $words[i] = -[$argopts_pass] ]]; then + # word with following argument --- check this + # is less than the current word, else we are completing + # this and shouldn't pass it down + if [[ $(( i + 1 )) -lt $CURRENT && \ + $words[i] = -[$argopts_pass] ]]; then _perforce_global_options+=(${words[i,i+1]}) fi (( i++ )) @@ -912,6 +915,8 @@ _perforce_hosts_ports() { if compset -P '*:'; then _ports + local expl + _wanted ports expl port compadd "$@" 1666 else # is this -q-able? _hosts -S : -- Peter Stephenson Software Engineer CSR Ltd., Science Park, Milton Road, Cambridge, CB4 0WH, UK Tel: +44 (0)1223 692070 ********************************************************************** The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon, this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from any computer. **********************************************************************