summaryrefslogtreecommitdiffstats
path: root/Completion/Base/_arguments
diff options
context:
space:
mode:
authorTanaka Akira <akr@users.sourceforge.net>1999-10-21 12:54:28 +0000
committerTanaka Akira <akr@users.sourceforge.net>1999-10-21 12:54:28 +0000
commitbc182b8c2f269a7f1ef2222a481b07f3488ae5f8 (patch)
treec9456c9443316d7c8f6eee90728e9b5354ce028d /Completion/Base/_arguments
parentzsh-workers/8359 (diff)
downloadzsh-bc182b8c2f269a7f1ef2222a481b07f3488ae5f8.tar
zsh-bc182b8c2f269a7f1ef2222a481b07f3488ae5f8.tar.gz
zsh-bc182b8c2f269a7f1ef2222a481b07f3488ae5f8.tar.bz2
zsh-bc182b8c2f269a7f1ef2222a481b07f3488ae5f8.tar.lz
zsh-bc182b8c2f269a7f1ef2222a481b07f3488ae5f8.tar.xz
zsh-bc182b8c2f269a7f1ef2222a481b07f3488ae5f8.tar.zst
zsh-bc182b8c2f269a7f1ef2222a481b07f3488ae5f8.zip
zsh-workers/8360
Diffstat (limited to 'Completion/Base/_arguments')
-rw-r--r--Completion/Base/_arguments6
1 files changed, 4 insertions, 2 deletions
diff --git a/Completion/Base/_arguments b/Completion/Base/_arguments
index a948d27e4..18ddf0327 100644
--- a/Completion/Base/_arguments
+++ b/Completion/Base/_arguments
@@ -71,7 +71,7 @@ if (( long )); then
lopts=("--${(@)^${(@)${(@)${(@M)${(@ps:\n:j:\n:)${(@)${(@M)${(@f)$(${~words[1]} --help 2>&1)//\[--/
--}:#[ ]#-*}//,/
-}}:#[ ]#--*}#*--}%%[, ]*}:#}")
+}}:#[ ]#--*}#*--}%%[], ]*}:#}")
# Now remove all ignored options ...
@@ -227,7 +227,8 @@ if comparguments -i "$compconfig[autodescribe_options]" "$@"; then
if [[ -z "$matched" ]] &&
comparguments -O next direct odirect equal &&
- [[ ( ( nm -eq compstate[nmatches] || -n "$noargs" ) && -z "$aret" ) ||
+ [[ ( ( nm -eq compstate[nmatches] || -n "$noargs" ) &&
+ -z "$aret" && -z "$mesg" ) ||
-z "$compconfig[option_prefix]" ||
"$compconfig[option_prefix]" = *\!${cmd}* ||
"$PREFIX" = [-+]* ]]; then
@@ -246,6 +247,7 @@ if comparguments -i "$compconfig[autodescribe_options]" "$@"; then
compadd "$expl[@]" -QqS= - "${PREFIX}${SUFFIX}"
else
tmp1=( "$next[@]" "$direct[@]" "$odirect[@]" "$equal[@]" )
+ tmp1=( "${(M@)tmp1:#[-+]?(|:*)}" )
tmp2=( "${PREFIX}${(@M)^${(@)${(@)tmp1%%:*}#[-+]}:#?}" )
_describe -o -c "$cmd" option tmp1 tmp2 -Q -S ''