about summary refs log tree commit diff
path: root/Completion/Base
diff options
context:
space:
mode:
authorTanaka Akira <akr@users.sourceforge.net>1999-08-19 14:41:32 +0000
committerTanaka Akira <akr@users.sourceforge.net>1999-08-19 14:41:32 +0000
commit6adafae34f2e04d2340b36e514ff190bdbab2e6b (patch)
treef67d763c7d6d0ff27a3447376023b97cfee11898 /Completion/Base
parent5460b0d4b805b372fee95bde1abb1af144fb4960 (diff)
downloadzsh-6adafae34f2e04d2340b36e514ff190bdbab2e6b.tar.gz
zsh-6adafae34f2e04d2340b36e514ff190bdbab2e6b.tar.xz
zsh-6adafae34f2e04d2340b36e514ff190bdbab2e6b.zip
zsh-workers/7450
Diffstat (limited to 'Completion/Base')
-rw-r--r--Completion/Base/_arguments4
-rw-r--r--Completion/Base/_long_options8
-rw-r--r--Completion/Base/_subscript4
3 files changed, 8 insertions, 8 deletions
diff --git a/Completion/Base/_arguments b/Completion/Base/_arguments
index 5170acb84..5e0d35d44 100644
--- a/Completion/Base/_arguments
+++ b/Completion/Base/_arguments
@@ -372,13 +372,13 @@ else
 
       # If the action starts with a space, we just call it.
 
-      $=action
+      ${(e)=~action}
     else
 
       # Otherwise we call it with the description-arguments built above.
 
       action=( $=action )
-      "$action[1]" "$expl[@]" "${(@)action[2,-1]}"
+      ${(e)action[1]} "$expl[@]" ${(e)~action[2,-1]}
     fi
   fi
 
diff --git a/Completion/Base/_long_options b/Completion/Base/_long_options
index f82de9ed5..461da893c 100644
--- a/Completion/Base/_long_options
+++ b/Completion/Base/_long_options
@@ -260,10 +260,10 @@ if [[ "$str" = *\=* ]]; then
         compadd "$expl[@]" - ${=action[2,-2]}
       elif (( $#action )); then
         if [[ "$action" = \ * ]]; then
-          $=action
+          ${(e)=~action}
         else
 	  action=($=action)
-	  $action[1] "$expl[@]" $action[2,-1]
+	  ${(e)action[1]} "$expl[@]" ${(e)~action[2,-1]}
         fi
       fi
 
@@ -310,10 +310,10 @@ if [[ "$str" = *\=* ]]; then
       if [[ "$parta[1]" = (\[|\() ]]; then
         compadd "$expl[@]" - ${=parta[2,-2]}
       elif [[ "$parta" = \ * ]]; then
-        $=parta
+        ${(e)=~parta}
       else
 	action=($=parta)
-	$action[1] "$expl[@]" $action[2,-1]
+	${(e)~parta[1]} "$expl[@]" ${(e)~action[2,-1]}
       fi
     else
       compadd -S '' - "$PREFIX"
diff --git a/Completion/Base/_subscript b/Completion/Base/_subscript
index 090a5f07a..76644bafb 100644
--- a/Completion/Base/_subscript
+++ b/Completion/Base/_subscript
@@ -4,8 +4,8 @@ local expl
 
 if [[ "$PREFIX" = :* ]]; then
   _description expl 'character class'
-  compadd -p: -S ':]' alnum alpha blank cntrl digit graph lower print punct \
-      space upper xdigit
+  compadd "$expl[@]" -p: -S ':]' alnum alpha blank cntrl digit graph \
+                                 lower print punct space upper xdigit
 elif [[ ${(Pt)${compstate[parameter]}} = assoc* ]]; then
   _description expl 'association key'
   if [[ "$RBUFFER" = \]* ]]; then