diff options
| author | Bart Schaefer <barts@users.sourceforge.net> | 2000-07-26 09:16:13 +0000 |
|---|---|---|
| committer | Bart Schaefer <barts@users.sourceforge.net> | 2000-07-26 09:16:13 +0000 |
| commit | f303f2ea63ce70f63355349bc0130ddb04a251f8 (patch) | |
| tree | dca8a07660778e388919abad3ba54a6dffd4d3e1 /Completion/Core/_expand | |
| parent | 04aaf1cd7f9fb791a3f305c2d8f6e7f995b1db6a (diff) | |
| download | zsh-f303f2ea63ce70f63355349bc0130ddb04a251f8.tar.gz zsh-f303f2ea63ce70f63355349bc0130ddb04a251f8.tar.xz zsh-f303f2ea63ce70f63355349bc0130ddb04a251f8.zip | |
Belatedly fold in 12162, to replace command subst with eval.
Diffstat (limited to 'Completion/Core/_expand')
| -rw-r--r-- | Completion/Core/_expand | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Completion/Core/_expand b/Completion/Core/_expand index 4515a20a2..09d89a30b 100644 --- a/Completion/Core/_expand +++ b/Completion/Core/_expand @@ -61,9 +61,9 @@ if [[ "$force" = *s* ]] || zstyle -T ":completion:${curcontext}:" substitute; then [[ ! -o ignorebraces && "${#${exp}//[^\{]}" = "${#${exp}//[^\}]}" ]] && eval exp\=\( ${${(q)exp}:gs/\\{/\{/:gs/\\}/\}/} \) - exp=( $(print -r ${${(e)exp//\\[ + eval 'exp=( ${${(e)exp//\\[ ]/ }//(#b)([ -])/\\$match[1]}) ) 2>/dev/null +])/\\$match[1]} )' 2>/dev/null else exp=( ${exp:s/\\\$/\$} ) fi @@ -95,7 +95,7 @@ subd=("$exp[@]") zstyle -s ":completion:${curcontext}:" keep-prefix tmp || tmp=changed if [[ "$word" = [\~\$]*/* && "$tmp" = (yes|true|on|1|changed) ]]; then - epre=( $(print -r ${(e)~${word%%/*}}) ) 2>/dev/null + eval 'epre=( ${(e)~${word%%/*}} )' 2>/dev/null if [[ -n "$epre" && $#epre -eq 1 ]]; then opre="${word%%/*}" pre="$epre[1]" |