about summary refs log tree commit diff
path: root/Completion/Base
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2000-05-02 08:23:31 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2000-05-02 08:23:31 +0000
commit753cc6b22adb659e9c6bdcf854d99bfe4b731d26 (patch)
tree9e3e7f2f5bb5bd6756860ee5d735b8392c01b3ed /Completion/Base
parent3d088f16aab58abcedcad8720ffbbfadee38bdc3 (diff)
downloadzsh-753cc6b22adb659e9c6bdcf854d99bfe4b731d26.tar.gz
zsh-753cc6b22adb659e9c6bdcf854d99bfe4b731d26.tar.xz
zsh-753cc6b22adb659e9c6bdcf854d99bfe4b731d26.zip
completion cleanup, mostly _wanted and $expl (11049)
Diffstat (limited to 'Completion/Base')
-rw-r--r--Completion/Base/_arguments11
-rw-r--r--Completion/Base/_first2
2 files changed, 7 insertions, 6 deletions
diff --git a/Completion/Base/_arguments b/Completion/Base/_arguments
index b1e790e1c..38002ccf6 100644
--- a/Completion/Base/_arguments
+++ b/Completion/Base/_arguments
@@ -298,14 +298,15 @@ if (( $# )) && comparguments "$multi[@]" "$autod" "$@"; then
 	
         if comparguments -s single; then
 
-          _description options expl option
-
           if [[ "$single" = direct ]]; then
-	    compadd "$expl[@]" -QS '' - "${PREFIX}${SUFFIX}"
+            _all_labels options expl option \
+	        compadd -QS '' - "${PREFIX}${SUFFIX}"
           elif [[ "$single" = next ]]; then
-	    compadd "$expl[@]" -Q - "${PREFIX}${SUFFIX}"
+            _all_labels options expl option \
+	        compadd -Q - "${PREFIX}${SUFFIX}"
           elif [[ "$single" = equal ]]; then
-	    compadd "$expl[@]" -QqS= - "${PREFIX}${SUFFIX}"
+            _all_labels options expl option \
+	        compadd -QqS= - "${PREFIX}${SUFFIX}"
           else
 	    tmp1=( "$next[@]" "$direct[@]" "$odirect[@]" "$equal[@]" )
 	    tmp3=( "${(M@)tmp1:#[-+]?[^:]*}" )
diff --git a/Completion/Base/_first b/Completion/Base/_first
index 4f10cbb8f..4b565fca4 100644
--- a/Completion/Base/_first
+++ b/Completion/Base/_first
@@ -33,7 +33,7 @@
 #           opt=-V
 #         fi
 #         if _wanted "$opt" history-words expl "history ($n)" \
-#                compadd "$expl[@]" -Q - \
+#                compadd -Q - \
 #                    "${(@)${(@)historywords:#[\$'\"]*}[1,i*10]}"; then
 #           # We have found at least one matching word, so we switch
 #           # on menu-completion and make sure that no other