From 4c2a62fe8623c24f3fbb56ed17550c7f02cf9316 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <okiddle@yahoo.co.uk>
Date: Sat, 30 May 2015 11:14:48 -0700
Subject: 35310 (plus undo 35268 (git 899613f)): fix quoting of cached arrays

Also add file name reference to ChangeLog entry from rev 899613f.
---
 Completion/Base/Utility/_store_cache | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'Completion')

diff --git a/Completion/Base/Utility/_store_cache b/Completion/Base/Utility/_store_cache
index 86e72e9a9..fb2ab328a 100644
--- a/Completion/Base/Utility/_store_cache
+++ b/Completion/Base/Utility/_store_cache
@@ -46,8 +46,15 @@ if zstyle -t ":completion:${curcontext}:" use-cache; then
   for var; do
     case ${(Pt)var} in
     (*readonly*) ;;
-    (*(association|array)*) print -r "$var=( ${(kv@Pqq)^^var} )";;
-    (*)                     print -r "$var=${(Pqq)^^var}";;
+    (*(association|array)*)
+	# Dump the array as a here-document to reduce parsing overhead
+	# when reloading the cache with "source" from _retrieve_cache
+	print -r "$var=( "'${(Q)"${(z)$(<<\EO:'"$var"
+	print -r "${(kv@Pqq)^^var}"
+	print -r "EO:$var"
+	print -r ')}"} )'
+	;;
+    (*) print -r "$var=${(Pqq)^^var}";;
     esac
   done >! "$_cache_dir/$_cache_ident"
 else
-- 
cgit 1.4.1