From bc182b8c2f269a7f1ef2222a481b07f3488ae5f8 Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Thu, 21 Oct 1999 12:54:28 +0000
Subject: zsh-workers/8360

---
 Completion/Base/_arguments | 6 ++++--
 Completion/Base/_values    | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'Completion/Base')

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 ''
diff --git a/Completion/Base/_values b/Completion/Base/_values
index 0c8f19a9f..fb70f6e7f 100644
--- a/Completion/Base/_values
+++ b/Completion/Base/_values
@@ -36,7 +36,7 @@ if compvalues -i "$@"; then
     else
       compvalues -d descr
       if [[ ${#noargs}+${#args}+${#opts} -ne 1 ]] && compvalues -s sep; then
-        sep=( "-qQS$sep" )
+        sep=( "-qQS" "$sep" )
       else
         sep=()
       fi
-- 
cgit 1.4.1