summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/text.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5df213ca1..3e9ce1747 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-25  Sven Wischnowsky  <wischnow@zsh.org>
+
+	* 15868: Src/text.c: job text building code couldn't handle
+	empty sublists (as in `coproc || test')
+
 2001-09-25  Clint Adams  <clint@zsh.org>
 
 	* 15866: Completion/Unix/Command/_ssh:
diff --git a/Src/text.c b/Src/text.c
index 2215b45fd..73b409e02 100644
--- a/Src/text.c
+++ b/Src/text.c
@@ -274,10 +274,12 @@ gettext2(Estate state)
 	    break;
 	case WC_SUBLIST:
 	    if (!s) {
+                if (wc_code(*state->pc) != WC_PIPE)
+                    stack = 1;
 		if (WC_SUBLIST_FLAGS(code) & WC_SUBLIST_NOT)
-		    taddstr("! ");
+		    taddstr(stack ? "!" : "! ");
 		if (WC_SUBLIST_FLAGS(code) & WC_SUBLIST_COPROC)
-		    taddstr("coproc ");
+		    taddstr(stack ? "coproc" : "coproc ");
 		s = tpush(code, (WC_SUBLIST_TYPE(code) == WC_SUBLIST_END));
 	    } else {
 		if (!(stack = (WC_SUBLIST_TYPE(code) == WC_SUBLIST_END))) {