From bf2b2bcce77371871c4e35eda549756c89b62fdc Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Tue, 4 Jan 2000 14:59:46 +0000 Subject: zsh-workers/9198 --- Completion/Base/_arguments | 7 ++++--- Completion/Base/_values | 7 ++++--- Completion/Core/_alternative | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Completion/Base/_arguments b/Completion/Base/_arguments index 5a6ee1930..5ff2f6311 100644 --- a/Completion/Base/_arguments +++ b/Completion/Base/_arguments @@ -246,13 +246,14 @@ if (( $# )) && comparguments -i "$autod" "$@"; then # If the action starts with a space, we just call it. - ${(e)=~action} + eval "action=( $action )" + "$action[@]" else # Otherwise we call it with the description-arguments built above. - action=( $=action ) - ${(e)action[1]} "$subopts[@]" "$expl[@]" ${(e)~action[2,-1]} + eval "action=( $action )" + "$action[1]" "$subopts[@]" "$expl[@]" "${(@)action[2,-1]}" fi fi fi diff --git a/Completion/Base/_values b/Completion/Base/_values index f35aa5a9a..7b174bc58 100644 --- a/Completion/Base/_values +++ b/Completion/Base/_values @@ -130,13 +130,14 @@ if compvalues -i "$@"; then # If the action starts with a space, we just call it. - ${(e)=~action} + eval "action=( $action )" + "$action[@]" else # Otherwise we call it with the description-arguments built above. - action=( $=action ) - ${(e)action[1]} "$subopts[@]" "$expl[@]" ${(e)~action[2,-1]} + eval "action=( $action )" + "$action[1]" "$subopts[@]" "$expl[@]" "${(@)action[2,-1]}" fi fi diff --git a/Completion/Core/_alternative b/Completion/Core/_alternative index 9d30884ae..a2fbd6b23 100644 --- a/Completion/Core/_alternative +++ b/Completion/Core/_alternative @@ -54,13 +54,14 @@ while _tags; do # If the action starts with a space, we just call it. - ${(e)=~action} + eval "action=( $action )" + "$action[@]" else # Otherwise we call it with the description-arguments built above. - action=( $=action ) - ${(e)action[1]} "$subopts[@]" "$expl[@]" ${(e)~action[2,-1]} + eval "action=( $action )" + "$action[1]" "$subopts[@]" "$expl[@]" "${(@)action[2,-1]}" fi fi done -- cgit 1.4.1