about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/parse.c10
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index da22b044a..acfea7d5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-26  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* users/10087: Src/parse.c: "case foo in" didn't turn off
+	aliases for "in", unlike "for" and "select".
+
 2006-03-26  Clint Adams  <clint@zsh.org>
 
 	* 22386: Completion/X/Command/_acroread: fix acroread
diff --git a/Src/parse.c b/Src/parse.c
index 1a6146968..a45231d15 100644
--- a/Src/parse.c
+++ b/Src/parse.c
@@ -1023,6 +1023,7 @@ static void
 par_case(int *complex)
 {
     int oecused = ecused, brflag, p, pp, n = 1, type;
+    int ona, onc;
 
     p = ecadd(0);
 
@@ -1033,14 +1034,23 @@ par_case(int *complex)
     ecstr(tokstr);
 
     incmdpos = 1;
+    ona = noaliases;
+    onc = nocorrect;
+    noaliases = nocorrect = 1;
     yylex();
     while (tok == SEPER)
 	yylex();
     if (!(tok == STRING && !strcmp(tokstr, "in")) && tok != INBRACE)
+    {
+	noaliases = ona;
+	nocorrect = onc;
 	YYERRORV(oecused);
+    }
     brflag = (tok == INBRACE);
     incasepat = 1;
     incmdpos = 0;
+    noaliases = ona;
+    nocorrect = onc;
     yylex();
 
     for (;;) {