From 9ecfa0842b73bb3b1253b2e95110f9b7ce91335f Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Wed, 12 May 2010 10:17:58 +0000
Subject: unposted: fix typo in previous commit

---
 ChangeLog              | 5 ++++-
 Doc/Zsh/params.yo      | 2 +-
 Src/Modules/zutil.c    | 2 +-
 Test/D04parameter.ztst | 9 +++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a1a0e6875..c988d56f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-05-12  Peter Stephenson  <pws@csr.com>
 
+	* unposted: Doc/Zsh/params.yo, Src/Modules/zutil.c: fix typo
+	("zregesparse-guard").
+
 	* 27951: Doc/Zsh/expn.yo, Doc/Zsh/params.yo, Src/builtin.c,
 	Src/exec.c, Src/glob.c, Src/init.c, Src/params.c, Src/signals.c,
 	Src/Builtins/sched.c, Src/Modules/zpty.c, Src/Modules/zutil.c:
@@ -13130,5 +13133,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4976 $
+* $Revision: 1.4977 $
 *****************************************************
diff --git a/Doc/Zsh/params.yo b/Doc/Zsh/params.yo
index 55d5cda6a..817731fb0 100644
--- a/Doc/Zsh/params.yo
+++ b/Doc/Zsh/params.yo
@@ -806,7 +806,7 @@ code.
 item(tt(zpty))(
 Code executed by the tt(zpty) builtin from the tt(zsh/zpty) module.
 )
-item(tt(zregesparse-guard))(
+item(tt(zregexparse-guard))(
 Code executed as a guard by the tt(zregexparse) command from the
 tt(zsh/zutil) module.
 )
diff --git a/Src/Modules/zutil.c b/Src/Modules/zutil.c
index 76ca92f79..3c71edfa7 100644
--- a/Src/Modules/zutil.c
+++ b/Src/Modules/zutil.c
@@ -1279,7 +1279,7 @@ rmatch(RParseResult *sm, char *subj, char *var1, char *var2, int comp)
 	    }
 	    if (next->pattern && pattry(next->patprog, subj) &&
 		(!next->guard || (execstring(next->guard, 1, 0,
-					     "zregesparse-guard"), !lastval))) {
+					     "zregexparse-guard"), !lastval))) {
 		LinkNode aln;
 		char **mend;
 		int len;
diff --git a/Test/D04parameter.ztst b/Test/D04parameter.ztst
index 13a7af2e4..4594e62fd 100644
--- a/Test/D04parameter.ztst
+++ b/Test/D04parameter.ztst
@@ -1219,3 +1219,12 @@
 >LOST
 >Subscript flags returning single values
 >STRING key= val=
+
+   print $zsh_eval_context[1]
+   [[ $ZSH_EVAL_CONTEXT = ${(j.:.)zsh_eval_context} ]] || print Not equal!
+   (( icontext = ${#zsh_eval_context} + 1 ))
+   contextfn() { print $(print $zsh_eval_context[icontext,-1]); }
+   contextfn
+0:$ZSH_EVAL_CONTEXT and $zsh_eval_context
+>toplevel
+>shfunc cmdsubst
-- 
cgit 1.4.1