about summary refs log tree commit diff
path: root/Completion/Core
diff options
context:
space:
mode:
authorSven Wischnowsky <wischnow@users.sourceforge.net>2000-05-23 08:54:30 +0000
committerSven Wischnowsky <wischnow@users.sourceforge.net>2000-05-23 08:54:30 +0000
commitee681a32ad5a2e69301494be45556a4020fe1384 (patch)
treefbb0c6fa5f02dd7a7525e2ab8a83c9c64b8c8b17 /Completion/Core
parentcb50583b184fd8aa456fcadd0c25e0c43f704a72 (diff)
downloadzsh-ee681a32ad5a2e69301494be45556a4020fe1384.tar.gz
zsh-ee681a32ad5a2e69301494be45556a4020fe1384.tar.xz
zsh-ee681a32ad5a2e69301494be45556a4020fe1384.zip
use `set -A' instead of `eval' in more places (11525)
Diffstat (limited to 'Completion/Core')
-rw-r--r--Completion/Core/_description12
-rw-r--r--Completion/Core/_next_label4
2 files changed, 8 insertions, 8 deletions
diff --git a/Completion/Core/_description b/Completion/Core/_description
index 4423f4a21..557dd6ca0 100644
--- a/Completion/Core/_description
+++ b/Completion/Core/_description
@@ -26,8 +26,8 @@ fi
 zstyle -s ":completion:${curcontext}:$1" group-name gname &&
     [[ -z "$gname" ]] && gname="$1"
 zstyle -s ":completion:${curcontext}:$1" matcher match &&
-    opts=($opts -M "${(q)match}")
-[[ -n "$_matcher" ]] && opts=($opts -M "${(q)_matcher}")
+    opts=($opts -M "$match")
+[[ -n "$_matcher" ]] && opts=($opts -M "$_matcher")
 
 if [[ -z "$_comp_no_ignore" ]]; then
   if zstyle -a ":completion:${curcontext}:$1" ignored-patterns _comp_ignore; then
@@ -48,15 +48,15 @@ shift 2
 
 if [[ -n "$gname" ]]; then
   if [[ -n "$format" ]]; then
-    eval "${name}=($opts $gropt ${(q)gname} -X \"${format}\")"
+    set -A "$name" "$opts[@]" "$gropt" "$gname" -X "$format"
   else
-    eval "${name}=($opts $gropt ${(q)gname})"
+    set -A "$name" "$opts[@]" "$gropt" "$gname"
   fi
 else
   if [[ -n "$format" ]]; then
-    eval "${name}=($opts $gropt -default- -X \"${format}\")"
+    set -A "$name" "$opts[@]" "$gropt" -default- -X "$format"
   else
-    eval "${name}=($opts $gropt -default-)"
+    set -A "$name" "$opts[@]" "$gropt" -default-
   fi
 fi
 
diff --git a/Completion/Core/_next_label b/Completion/Core/_next_label
index 620e67421..95569df3b 100644
--- a/Completion/Core/_next_label
+++ b/Completion/Core/_next_label
@@ -13,10 +13,10 @@ if comptags -A "$1" curtag spec; then
     zformat -f descr "${curtag#*:}" "d:$3"
     _description "$gopt" "${curtag%:*}" "$2" "$descr"
     curtag="${curtag%:*}"
-    set -A $2 "${(P@)2}" "${argv[4,-1][@]}"
+    set -A $2 "${(P@)2}" "${(@)argv[4,-1]}"
   else
     _description "$gopt" "$curtag" "$2" "$3"
-    set -A $2 "${argv[4,-1][@]}" "${(P@)2}"
+    set -A $2 "${(@)argv[4,-1]}" "${(P@)2}"
   fi
 
   return 0