mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-03 10:21:46 +02:00
Code Releases Activity

Tweak test for function level of exit.

Browse source 
Sometimes local level jumps so we need an inequality instead
of an equality.
This commit is contained in:
Peter Stephenson 2015-05-22 23:37:20 +01:00
parent 589350c776
commit 2f6a8a6c6c
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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

2
Src/exec.c
View file

@ -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;