Re: PATCH: completion

[Tanaka Akira <akr@xxxxxxxxxxx>]

In article <rsqiu6162zd.fsf@xxxxxxxxxxxxxxxxx>,
  Tanaka Akira <akr@xxxxxxxxxxx> writes:

> Also, I modified cvs completion functions.

I modified _cvs_history_x to show explanations.
Then I found another _arguments problem.

Z(2):akr@is27e1u11% ./Src/zsh -f
is27e1u11% bindkey -e; fpath=($PWD/Completion/*(/)); autoload -U compinit; compinit -D; compdef _tst tst
compconf message_format='%d'
compconf description_format='%d'
is27e1u11% compconf group_matches=yes
is27e1u11% compconf message_format='%d'
is27e1u11% compconf description_format='%d'

is27e1u11% cvs history -x
add               editors           logout            unedit
admin             export            rdiff             update
annotate          history           release           watch
checkout          import            remove            watchers
commit            init              rtag              
diff              log               status            
edit              login             tag               
option
--allow-root=     -H                -e                -s
--help            -Q                -f                -t
--help-commands   -T                -l                -v
--help-options    -a                -n                -w
--help-synonyms   -b                -q                -z
--version         -d                -r                

is27e1u11% cvs history -e <TAB>
is27e1u11% cvs history -e vi 

is27e1u11% cvs history -e<TAB>
is27e1u11% cvs history -evi 

Hm. _arguments called from _cvs should not complete options after
non-option arguments.

Index: Completion/Cvs/_cvs_history_x
===================================================================
RCS file: /projects/zsh/zsh/Completion/Cvs/_cvs_history_x,v
retrieving revision 1.1.1.1
diff -u -F^( -r1.1.1.1 _cvs_history_x
--- _cvs_history_x	1999/08/26 11:08:18	1.1.1.1
+++ _cvs_history_x	1999/08/28 05:50:39
@@ -2,4 +2,16 @@
 
 compset -P '*'
 # It should describe meaning.
-compadd F O E T C G U W A M R
+compadd "$@" -y '(
+F\ --\ release
+O\ --\ checkout
+E\ --\ export
+T\ --\ rtag
+C\ --\ merge\ collision-detected
+G\ --\ merge\ succeed
+U\ --\ working\ file\ was\ copied
+W\ --\ working\ file\ was\ deleted
+A\ --\ A\ file\ was\ added
+M\ --\ A\ file\ was\ modified
+R\ --\ A\ file\ was\ removed
+)' F O E T C G U W A M R
-- 
Tanaka Akira