From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3485 invoked by alias); 4 Mar 2011 12:17:41 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 28852 Received: (qmail 29459 invoked from network); 4 Mar 2011 12:17:39 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received-SPF: pass (ns1.primenet.com.au: SPF record at _spf.google.com designates 209.85.212.43 as permitted sender) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:date:message-id:subject:from:to :content-type; bh=UG/xZFLEQ+axcffSuwZs2h6foF8GIjWBRINc5c+W7FA=; b=hhHOfWNAeJywrO/mghIHBL3M1sjsNhAygvjnWBgMBn5PBD/SH0KIBTfuvNvDc3qvpw 158dMTu4lSwvxR45f9fLqNoZCNqJYAWfMOGEmdaJV1lURA1aI4sQjZ4cYsvuTvGnNopM xqA57wfmRgHT4Uz7Ib8jhTXs539dWz0TtDIG8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=KWueWYg31PG3RAN8QBmf2OB1HYtY2+wsiqa21aD+8ulCZccF7ioDE/+J1AROgfINvo Qw+sga7ob92BSft48lRgV6fQvjQltYM/YOuHxJkVJQSeVwSAr6PksawQ6qPxEgAjWBBK 80nZkx4E7/dhP5nLq8gyMwWuLJloMUe9MIohE= MIME-Version: 1.0 Date: Fri, 4 Mar 2011 13:17:32 +0100 Message-ID: Subject: fix some distributed functions that depend on shortloops From: Mikael Magnusson To: zsh workers Content-Type: text/plain; charset=UTF-8 http://cgit.mika.l3ib.org/cgit/zsh-cvs/patch/?id=1067eea1d44eda8e0c342bc8253fb6ce5075e0b3 diff --git a/Functions/Misc/zargs b/Functions/Misc/zargs index 58d8461..8350b1a 100644 --- a/Functions/Misc/zargs +++ b/Functions/Misc/zargs @@ -207,7 +207,7 @@ then else call=($command) # Use "repeat" here so "continue" won't complain. - repeat 1 eval "$execute ; $analyze" + repeat 1; do eval "$execute ; $analyze"; done return $ret fi fi @@ -273,7 +273,7 @@ do repeat $P do ((ARGC)) || break - for (( end=l; end && ${(c)#argv[1,end]} > s; end/=2 )) : + for (( end=l; end && ${(c)#argv[1,end]} > s; end/=2 )) { } (( end > n && ( end = n ) )) args=( $argv[1,end] ) shift $((end > ARGC ? ARGC : end)) diff --git a/Functions/Zle/match-words-by-style b/Functions/Zle/match-words-by-style index 69ceba7..b387828 100644 --- a/Functions/Zle/match-words-by-style +++ b/Functions/Zle/match-words-by-style @@ -220,8 +220,7 @@ if [[ $wordstyle = *subword* ]]; then fi match=() -charskip= -repeat $skip charskip+=\? +charskip=${(l:skip::?:)} eval pat2='${RBUFFER##(#b)('${charskip}${spacepat}')('\ ${wordpat2}')('${spacepat}')}' -- Mikael Magnusson