From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5055 invoked from network); 28 Jul 1999 16:05:28 -0000 Received: from sunsite.auc.dk (130.225.51.30) by ns1.primenet.com.au with SMTP; 28 Jul 1999 16:05:28 -0000 Received: (qmail 28226 invoked by alias); 28 Jul 1999 16:05:16 -0000 Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 7307 Received: (qmail 28218 invoked from network); 28 Jul 1999 16:05:15 -0000 To: zsh-workers@sunsite.auc.dk Subject: Re: PATCH: Re: CVS completer (Re: PATCH: Re: Completion/User functions again) References: <199907211127.NAA02895@beta.informatik.hu-berlin.de> <990721155446.ZM6856@candle.brasslantern.com> <990727074804.ZM25420@candle.brasslantern.com> <990727134938.ZM26449@candle.brasslantern.com> MIME-Version: 1.0 (generated by AKEMI 1.13.2 - =?ISO-2022-JP?B?Ig==?= =?ISO-2022-JP?B?GyRCQTA0Y0s8GyhCIg==?=) Content-Type: text/plain; charset=US-ASCII From: Tanaka Akira Date: 29 Jul 1999 01:05:13 +0900 In-Reply-To: Tanaka Akira's message of "27 Jul 1999 23:11:41 +0900" Message-ID: User-Agent: Chao-gnus/6.12.5 AKEMI/1.13.2 (=?ISO-2022-JP?B?GyRCQTAbKEI=?= =?ISO-2022-JP?B?GyRCNGNLPBsoQg==?=) FLAM-DOODLE/1.12.6 (=?ISO-2022-JP?B?GyRCM3cbKEI=?= 10R4.0/5.0) Emacs/20.4 (sparc-sun-solaris2.6) MULE/4.0 (HANANOEN) In article , Tanaka Akira writes: > I found a problem of return status of _cvstargets, etc. Hm. When entries has just one elements, the argument such as '(_cvs)' is supplied to compgen -g and it is treated as glob qualifiers. The completer should not use parenthesises in this case. This patch also tries to complete arguments for some options. --- Completion/User/_cvs Wed Jul 28 14:37:08 1999 +++ Completion/User/_cvs Wed Jul 28 14:45:23 1999 @@ -35,16 +35,17 @@ _cvstargets ;; annotate|ann) # "+lr:D:fR" - _complete_opts l '' r: '' D: '' f '' R '' || _cvstargets + _complete_opts l '' r: "$complete_r" D: "$complete_D" f '' R '' || + _cvstargets ;; checkout|co|get) # "+ANnk:d:flRpQqcsr:D:j:P" - _complete_opts A '' N '' n '' k: "$complete_k" d: '' f '' l '' R ''\ - p '' Q '' q '' c '' s '' r: "$complete_r" D: "$complete_D" j: '' \ - P '' || + _complete_opts A '' N '' n '' k: "$complete_k" d: '_files -/' f '' \ + l '' R '' p '' Q '' q '' c '' s '' r: "$complete_r" D: "$complete_D" \ + j: "$complete_r" P '' || _cvsrepositories ;; commit|ci|com) # "+nlRm:fF:r:" - _complete_opts n '' l '' R '' m: "$complete_m" f '' F: '' \ + _complete_opts n '' l '' R '' m: "$complete_m" f '' F: _files \ r: "$complete_r" || _cvstargets_modified ;; @@ -56,15 +57,15 @@ _cvstargets_modified || _cvstargets ;; edit) # "+lRa:" - _complete_opts l '' R '' a: '' || _cvstargets + _complete_opts l '' R '' a: 'compadd edit unedit commit all none' || + _cvstargets ;; editors) # "+lR" _complete_opts l '' R '' || _cvstargets ;; - export|exp|ex) # "+ANnk:d:flRpQqcsr:D:j:P" - _complete_opts A '' N '' n '' k: "$complete_k" d: '' f '' l '' R '' \ - p '' Q '' q '' c '' s '' r: "$complete_r" D: "$complete_D" j: '' \ - P '' || + export|exp|ex) # "+Nnk:d:flRQqr:D:" + _complete_opts N '' n '' k: "$complete_k" d: '_files -/' f '' l '' \ + R '' Q '' q '' r: "$complete_r" D: "$complete_D" || _cvsrepositories ;; history|hi|his) # "+Tacelow?D:b:f:m:n:p:r:t:u:x:X:z:" @@ -74,7 +75,7 @@ _cvstargets ;; import|im|imp) # "+Qqdb:m:I:k:W:" - _complete_opts Q '' q '' d '' b: '' m: "$complete_m" I: '' \ + _complete_opts Q '' q '' d '' b: '' m: "$complete_m" I: _files \ k: "$complete_k" W: '' || case $[CURRENT-com] in 1) _cvsrepositories;; @@ -113,8 +114,8 @@ ;; update|up|upd) # "+ApPflRQqduk:r:D:j:I:W:" _complete_opts A '' p '' P '' f '' l '' R '' Q '' q '' d '' u '' \ - k: "$complete_k" r: "$complete_r" D: "$complete_D" j: '' I: '' \ - W: '' || + k: "$complete_k" r: "$complete_r" D: "$complete_D" j: "$complete_r" \ + I: '' W: '' || _cvstargets ;; watch) @@ -126,7 +127,9 @@ _complete_opts l '' R '' || _cvstargets ;; add|remove) # "+lRa:" - _complete_opts l '' R '' a: '' || _cvstargets + _complete_opts l '' R '' \ + a: 'compadd edit unedit commit all none' || \ + _cvstargets ;; esac fi @@ -247,11 +250,11 @@ _cvsdirs () { if [[ -d ${pref}CVS ]]; then _cvsdirentries - if (( $#entries )); then - compgen "$@" -g '('${(j:|:)entries:q}')' - else - false - fi + case $#entries in + 0) false;; + 1) compgen "$@" -g "${entries:q}";; + *) compgen "$@" -g '('${(j:|:)entries:q}')';; + esac else _files fi @@ -262,11 +265,11 @@ _cvsprefix if [[ -d ${pref}CVS ]]; then _cvsentries - if (( $#entries )); then - compgen -g '('${(j:|:)entries:q}')' - else - false - fi + case $#entries in + 0) false;; + 1) compgen -g "${entries:q}";; + *) compgen -g '('${(j:|:)entries:q}')';; + esac else _files fi @@ -277,11 +280,11 @@ _cvsprefix if [[ -d ${pref}CVS ]]; then _cvsentries_modified - if (( $#entries )); then - compgen -g '('${(j:|:)entries:q}')' - else - false - fi + case $#entries in + 0) false;; + 1) compgen -g "${entries:q}";; + *) compgen -g '('${(j:|:)entries:q}')';; + esac else _files fi -- Tanaka Akira