diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/text.c | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 47181eb65..60ca41dc9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,6 @@ 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') - - * 15868: Src/text.c: job text building code couldn't handle + * 15868, 15869: Src/text.c: job text building code couldn't handle empty sublists (as in `coproc || test') 2001-09-25 Clint Adams <clint@zsh.org> diff --git a/Src/text.c b/Src/text.c index 73b409e02..ddb4b8a2a 100644 --- a/Src/text.c +++ b/Src/text.c @@ -274,8 +274,9 @@ 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_SIMPLE) && + wc_code(*state->pc) != WC_PIPE) + stack = -1; if (WC_SUBLIST_FLAGS(code) & WC_SUBLIST_NOT) taddstr(stack ? "!" : "! "); if (WC_SUBLIST_FLAGS(code) & WC_SUBLIST_COPROC) @@ -293,7 +294,7 @@ gettext2(Estate state) taddstr("coproc "); } } - if (!stack && (WC_SUBLIST_FLAGS(s->code) & WC_SUBLIST_SIMPLE)) + if (stack < 1 && (WC_SUBLIST_FLAGS(s->code) & WC_SUBLIST_SIMPLE)) state->pc++; break; case WC_PIPE: |