From 854c9fdafa2d0c63442d98cce1b87c0ec51c8cde Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Fri, 15 Oct 1999 09:45:33 +0000
Subject: zsh-workers/8272

---
 Completion/Base/_describe | 2 +-
 Completion/Base/_values   | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'Completion/Base')

diff --git a/Completion/Base/_describe b/Completion/Base/_describe
index c0b3d7174..2bb32ad35 100644
--- a/Completion/Base/_describe
+++ b/Completion/Base/_describe
@@ -50,7 +50,7 @@ shift
 if [[ -n "$showd" ]]; then
   compdescribe -I ' -- ' "$@"
 else
-  compdescribe -i ' -- ' "$@"
+  compdescribe -i "$@"
 fi
 
 [[ -n "$isopt" && "$compconfig[option_prefix]" = hide* ]] && hide=yes
diff --git a/Completion/Base/_values b/Completion/Base/_values
index 549c71ff8..0c8f19a9f 100644
--- a/Completion/Base/_values
+++ b/Completion/Base/_values
@@ -82,13 +82,8 @@ if compvalues -i "$@"; then
 
       eval ws\=\( "${action[3,-3]}" \)
 
-      if [[ -n "$compconfig[describe_values]" &&
-            "$compconfig[describe_values]" != *\!${cmd}* ]] &&
-         compdisplay tmp ' -- ' "$ws[@]"; then
-	compadd "$expl[@]" -M 'r:|[_-]=* r:|=*' -ld tmp - "${(@)ws%%:*}"
-      else
-	compadd "$expl[@]" - "${(@)ws%%:*}"
-      fi
+      _describe "$descr" ws -M 'r:|[_-]=* r:|=*'
+
     elif [[ "$action" = \(*\) ]]; then
 
       # Anything inside `(...)' is added directly.
-- 
cgit 1.4.1