diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-05-22 23:37:20 +0100 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2015-05-22 23:37:45 +0100 |
| commit | 2f6a8a6c6c3774ac6f9317288adf03e2a065cb42 (patch) | |
| tree | a3c18a542e3e3e8fffbf951e691a6245e801aad6 | |
| parent | 589350c776c2c91ba4263f3469a015c673084d0f (diff) | |
| download | zsh-2f6a8a6c6c3774ac6f9317288adf03e2a065cb42.tar.gz zsh-2f6a8a6c6c3774ac6f9317288adf03e2a065cb42.tar.xz zsh-2f6a8a6c6c3774ac6f9317288adf03e2a065cb42.zip | |
Tweak test for function level of exit.
Sometimes local level jumps so we need an inequality instead of an equality.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/exec.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index ceda73787..658ce348c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-05-22 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * 35266: Src/exec.c: test from users/20203 needed changing + because of jumps in locallevel. + 2015-05-23 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> * 35255: configure.sc, Doc/Makefile.in: if available, use diff --git a/Src/exec.c b/Src/exec.c index 527dffba8..527d61197 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -5109,7 +5109,7 @@ doshfunc(Shfunc shfunc, LinkList doshargs, int noreturnval) * when we have an "always" block. The endparamscope() has * already happened, hence the "+1" here. */ - if (exit_pending && exit_level == locallevel+1) { + if (exit_pending && exit_level >= locallevel+1) { if (locallevel > forklevel) { /* Still functions to return: force them to do so. */ retflag = 1; |