1
0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-11-19 13:33:52 +01:00

fix removal of automatically added specs (from the -- option) for which a user-defined one is present (17191)

This commit is contained in:
Sven Wischnowsky 2002-05-21 07:44:57 +00:00
parent d4ec8d06bf
commit ba168b43da
3 changed files with 8 additions and 3 deletions

@ -1,5 +1,10 @@
2002-05-21 Sven Wischnowsky <wischnow@zsh.org>
* 17191: Completion/Base/Utility/_arguments,
Completion/Unix/Command/_rsync: fix removal of automatically
added specs (from the -- option) for which a user-defined one
is present
* 17190: Src/Zle/computil.c: avoid printing in the last screen
column when preparing a completion listing with compdescribe

@ -74,11 +74,11 @@ if (( long )); then
# Remove options also described by user-defined specs.
tmp=()
for opt in "${(@)lopts:#--}"; do
for opt in "${(@)${(@)lopts:#--}%%\=*}"; do
# Using (( ... )) gives a parse error.
let "$tmpargv[(I)(|\([^\)]#\))(|\*)${opt}(|[-+=])(|\[*\])(|:*)]" ||
let "$tmpargv[(I)(|\([^\)]#\))(|\*)${opt}(|[-+]|=(|-))(|\[*\])(|:*)]" ||
tmp=( "$tmp[@]" "$opt" )
done
lopts=( "$tmp[@]" )

@ -121,7 +121,7 @@ _arguments -C -s \
'(--whole-file)-W[copy whole files]' \
'(-W)--whole-file[copy whole files]' \
'(--one-file-system)-x[do not cross filesystem boundaries]' \
'(-x)-one-file-system[do not cross filesystem boundaries]' \
'(-x)--one-file-system[do not cross filesystem boundaries]' \
'(--block-size)-B[checksum blocking size]:block size:' \
'(-B)--block-size=[checksum blocking size]:block size:' \
'(--rsh)-e[rsh command]:remote command:(rsh ssh)' \