Fix completion when ksh_arrays is set.

Spotted by Christopher Zimmermann <madroach at zakweb.de>, thanks ! ok ajacoutot@
avsm · Sep 27, 2011 · 929471f · 929471f
1 parent e904830
commit 929471f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
@@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.62 2011/06/22 11:41:35 pea Exp $
+# $OpenBSD: Makefile,v 1.63 2011/09/27 13:30:24 pea Exp $
 
 COMMENT=	Z shell, Bourne shell-compatible
 
 V=		4.3.12
 DISTNAME=	zsh-$V
 CATEGORIES=	shells
 
+REVISION=	0
+
 MAINTAINER=	Pierre-Emmanuel Andre <pea@openbsd.org>
 
 HOMEPAGE=	http://www.zsh.org/

diff --git a/shells/zsh/patches/patch-Completion_compinit b/shells/zsh/patches/patch-Completion_compinit
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Completion_compinit,v 1.1 2011/09/27 13:30:24 pea Exp $
+--- Completion/compinit.orig	Tue Sep 27 14:47:45 2011
++++ Completion/compinit	Tue Sep 27 14:48:34 2011
+@@ -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;
diff --git a/shells/zsh/pkg/PLIST b/shells/zsh/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.32 2011/06/22 11:41:35 pea Exp $
+@comment $OpenBSD: PLIST,v 1.33 2011/09/27 13:30:24 pea Exp $
 @pkgpath shells/zsh,-main
 @shell bin/zsh
 %%SHARED%%
@@ -710,6 +710,7 @@ share/zsh/${V}/functions/colors
 share/zsh/${V}/functions/compaudit
 share/zsh/${V}/functions/compdump
 share/zsh/${V}/functions/compinit
+@comment share/zsh/${V}/functions/compinit.orig
 share/zsh/${V}/functions/compinstall
 share/zsh/${V}/functions/copy-earlier-word
 share/zsh/${V}/functions/cycle-completion-positions