summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/exec.c2
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;