diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/loop.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 4b5a0b8df..ad71ac8f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-11-25 Barton E. Schaefer <schaefer@zsh.org> + + * 33791: Src/loop.c: fatal errors in the try-block part of an + "always" construct cause the entire construct to have nonzero + status, even when TRY_BLOCK_ERROR is used to suppress the error. + 2014-11-24 Peter Stephenson <p.stephenson@samsung.com> * Daniel Hahler: 33746: Doc/Zsh/builtins.yo: read -q refers to -t. diff --git a/Src/loop.c b/Src/loop.c index 2f639fd5a..82d2fe31a 100644 --- a/Src/loop.c +++ b/Src/loop.c @@ -659,8 +659,9 @@ exectry(Estate state, int do_exec) try_tryflag = save_try_tryflag; - /* Don't record errflag here, may be reset. */ - endval = lastval; + /* Don't record errflag here, may be reset. However, */ + /* endval should show failure when there is an error. */ + endval = lastval ? lastval : errflag; freeheap(); |