about summary refs log tree commit diff
path: root/Src/text.c
diff options
context:
space:
mode:
authorPaul Ackersviller <packersv@users.sourceforge.net>2007-11-11 21:51:20 +0000
committerPaul Ackersviller <packersv@users.sourceforge.net>2007-11-11 21:51:20 +0000
commit66ae2822dd269332a06641d8fc0da0c0e60734eb (patch)
treedb8451cd0044899ae62b5cc63e44503e744cb66a /Src/text.c
parent469921ba16eae89eb7ecfb1ea8fcdd34c1b0a642 (diff)
downloadzsh-66ae2822dd269332a06641d8fc0da0c0e60734eb.tar.gz
zsh-66ae2822dd269332a06641d8fc0da0c0e60734eb.tar.xz
zsh-66ae2822dd269332a06641d8fc0da0c0e60734eb.zip
Merge of 23115: add ";|" at end of case statement to cause testing of later patterns.
Diffstat (limited to 'Src/text.c')
-rw-r--r--Src/text.c28
1 files changed, 26 insertions, 2 deletions
diff --git a/Src/text.c b/Src/text.c
index 0aca8371a..55e03c579 100644
--- a/Src/text.c
+++ b/Src/text.c
@@ -537,7 +537,19 @@ gettext2(Estate state)
 		}
 	    } else if (state->pc < s->u._case.end) {
 		tindent--;
-		taddstr(WC_CASE_TYPE(code) == WC_CASE_OR ? " ;;" : ";&");
+		switch (WC_CASE_TYPE(code)) {
+		case WC_CASE_OR:
+		    taddstr(" ;;");
+		    break;
+
+		case WC_CASE_AND:
+		    taddstr(";&");
+		    break;
+
+		default:
+		    taddstr(";|");
+		    break;
+		}
 		if (tnewlins)
 		    taddnl();
 		else
@@ -553,7 +565,19 @@ gettext2(Estate state)
 			  s->u._case.end);
 	    } else {
 		tindent--;
-		taddstr(WC_CASE_TYPE(code) == WC_CASE_OR ? " ;;" : ";&");
+		switch (WC_CASE_TYPE(code)) {
+		case WC_CASE_OR:
+		    taddstr(" ;;");
+		    break;
+
+		case WC_CASE_AND:
+		    taddstr(";&");
+		    break;
+
+		default:
+		    taddstr(";|");
+		    break;
+		}
 		tindent--;
 		if (tnewlins)
 		    taddnl();