From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28560 invoked from network); 31 Aug 1999 15:13:10 -0000 Received: from postoffice.telstra.net (139.130.4.7) by ns1.primenet.com.au with SMTP; 31 Aug 1999 15:13:10 -0000 Received: from sunsite.auc.dk (sunsite.auc.dk [130.225.51.30]) by postoffice.telstra.net (8.8.8/8.8.8) with SMTP id AAA06460 for ; Wed, 1 Sep 1999 00:46:29 +1000 (EST) (envelope-from zsh-workers-return-7580-mason-zsh=primenet.com.au@sunsite.auc.dk) Received: (qmail 14628 invoked by alias); 31 Aug 1999 15:10:24 -0000 Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 7580 Received: (qmail 14621 invoked from network); 31 Aug 1999 15:10:23 -0000 To: zsh-workers@sunsite.auc.dk Subject: PATCH: Completion/Cvs/ 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: 01 Sep 1999 00:03:57 +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) This update cvs completion functions. (1) Use "--opt=" instead of "--opt=-" when an argument for the option is required. (2) More cvs diff description. Some long options such as "--context" has "optional_argument". I used "--context=-" for the argument of _arguments. But it may better to use another form that specify "=" as removal suffix. Also, I found a problem about _arguments. Z(2):akr@is27e1u11% ./Src/zsh -f is27e1u11% bindkey -e; fpath=($PWD/Completion/*(/)); autoload -U compinit; compinit -D; compdef _tst tst is27e1u11% compconf group_matches=yes is27e1u11% compconf message_format='%d' is27e1u11% compconf description_format='%d' is27e1u11% cvs login -e -> is27e1u11% cvs login -evi is27e1u11% _tst () { _arguments '-e+:editor:(vi)' '*::mesg:false' } is27e1u11% tst a -e -> is27e1u11% tst a -evi Becase _tst use '*::...', "vi" should not be completed. Index: Completion/Cvs/_cvs =================================================================== RCS file: /projects/zsh/zsh/Completion/Cvs/_cvs,v retrieving revision 1.1.1.2 diff -u -F^( -r1.1.1.2 _cvs --- _cvs 1999/08/27 12:05:29 1.1.1.2 +++ _cvs 1999/08/31 14:46:33 @@ -4,7 +4,7 @@ _arguments -s \ -{a,f,H,l,n,Q,q,r,t,v,w,x} \ '--version' '--help' '--help-commands' '--help-synonyms' '--help-options' \ - '--allow-root=-:rootdir:_files -/' \ + '--allow-root=:rootdir:_files -/' \ '-b+:bindir:_cvs_bindir' \ '-T+:temporary directory:_cvs_tempdir' \ '-d+:cvsroot:_cvs_root' \ Index: Completion/Cvs/_cvs_diff =================================================================== RCS file: /projects/zsh/zsh/Completion/Cvs/_cvs_diff,v retrieving revision 1.1.1.1 diff -u -F^( -r1.1.1.1 _cvs_diff --- _cvs_diff 1999/08/26 11:08:18 1.1.1.1 +++ _cvs_diff 1999/08/31 14:46:33 @@ -2,14 +2,46 @@ # "+abcdefhilnpstuw0123456789BHNRC:D:F:I:L:U:V:W:k:r:" _arguments -s \ - -{a,b,c,d,e,f,h,i,l,n,p,s,t,u,w,0,1,2,3,4,5,6,7,8,9,B,H,N,R} \ - '-C:lines:' \ + -{l,R} \ '-D+:date:_cvs_D' \ - '-F+:regex:' \ - '-I+:regex:' \ - '*-L+:label:' \ - '-U:lines:' \ - '-W:columns:' \ '-k+:keyword substitution:_cvs_k' \ '-r+:tag:_cvs_revisions' \ + -{h,p,0,1,2,3,4,5,6,7,8,9} \ + '--binary' \ + '--brief' \ + '--changed-group-format=:format:' \ + '-c' '-C+:lines:' '--context=-:lines:' \ + '-e' '--ed' \ + '-t' '--expand-tabs' \ + '-f' '--forward-ed' \ + '--horizon-lines=:lines:' \ + '--ifdef=:name:' \ + '-w' '--ignore-all-space' \ + '-B' '--ignore-blank-lines' \ + '-i' '--ignore-case' \ + '-I+:regex:' '--ignore-matching-lines=:regex:' \ + '-b' '--ignore-space-change' \ + '--initial-tab' \ + '*-L+:label:' '*--label=:label:' \ + '--left-column' \ + '--line-format=:format:' \ + '-d' '--minimal' \ + '-N' '--new-file' \ + '--new-group-format=:format:' \ + '--new-line-format=:format:' \ + '--old-group-format=:format:' \ + '--old-line-format=:format:' \ + '--paginate' \ + '-n' '--rcs' \ + '-s' '--report-identical-files' \ + '--show-c-function' \ + '-F+:regex:' '--show-function-line=:regex:' \ + '-y' '--side-by-side' \ + '-H' '--speed-large-files' \ + '--suppress-common-lines' \ + '-a' '--text' \ + '--unchanged-group-format=:format:' \ + '--unchanged-line-format=:format:' \ + '-u' '-U+:lines:' '--unified=-:lines:' \ + '-W:columns:' '--width=:columns:' \ '*:file:_cvs_diff_arg' Index: Completion/Cvs/_cvs_history_x =================================================================== RCS file: /projects/zsh/zsh/Completion/Cvs/_cvs_history_x,v retrieving revision 1.1.1.2 diff -u -F^( -r1.1.1.2 _cvs_history_x --- _cvs_history_x 1999/08/28 06:26:32 1.1.1.2 +++ _cvs_history_x 1999/08/31 14:46:33 @@ -1,7 +1,7 @@ #autoload compset -P '*' -# It should describe meaning. + compadd "$@" -y '( F\ --\ release O\ --\ checkout -- Tanaka Akira