summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Completion/compinit2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7479f3218..3f8e821c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-22  Mikael Magnusson <mikachu@gmail.com>
+
+	* 29596: Completion/compinit: Fix syntax to work with KSH_ARRAYS
+	set.
+
 2011-07-22  Nikolai Weibull <now@bitwi.se>
 
 	* unposted: Completion/Unix/Command/_git: Use _files, not _path_files.
@@ -15149,5 +15154,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5405 $
+* $Revision: 1.5406 $
 *****************************************************
diff --git a/Completion/compinit b/Completion/compinit
index a0f2348a9..d25642e5d 100644
--- a/Completion/compinit
+++ b/Completion/compinit
@@ -161,7 +161,7 @@ _comp_options=(
 # and don't get confused by user's ZERR trap handlers.
 
 typeset -g _comp_setup='local -A _comp_caller_options;
-             _comp_caller_options=(${(kv)options});
+             _comp_caller_options=(${(kv)options[@]});
              setopt localoptions localtraps ${_comp_options[@]};
              local IFS=$'\'\ \\t\\r\\n\\0\''
              exec </dev/null;