diff options
| author | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2017-08-24 19:46:20 +0100 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2017-08-24 19:46:20 +0100 |
| commit | 97d4bdbc7e86e6e8da0d4a059b118ffab289d3a9 (patch) | |
| tree | 4b00406423534eb1b472ca29401e1683c73d9178 /Src/init.c | |
| parent | d6aa94997750a63712c8928b243b7c61fa73878b (diff) | |
| download | zsh-97d4bdbc7e86e6e8da0d4a059b118ffab289d3a9.tar.gz zsh-97d4bdbc7e86e6e8da0d4a059b118ffab289d3a9.tar.xz zsh-97d4bdbc7e86e6e8da0d4a059b118ffab289d3a9.zip | |
41590 modified as 41595: make ERR_RETURN more logical.
It now operates separately at each function depth. To keep ERR_EXIT global, make the noerrexit variable usd bit flags. Extend tests.
Diffstat (limited to 'Src/init.c')
| -rw-r--r-- | Src/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Src/init.c b/Src/init.c index d8c26aca2..87dd2e26d 100644 --- a/Src/init.c +++ b/Src/init.c @@ -1070,7 +1070,7 @@ setupvals(char *cmd, char *runscript, char *zsh_name) sfcontext = SFC_NONE; trap_return = 0; trap_state = TRAP_STATE_INACTIVE; - noerrexit = -1; + noerrexit = NOERREXIT_EXIT | NOERREXIT_RETURN | NOERREXIT_SIGNAL; nohistsave = 1; dirstack = znewlinklist(); bufstack = znewlinklist(); @@ -1199,7 +1199,7 @@ init_signals(void) void run_init_scripts(void) { - noerrexit = -1; + noerrexit = NOERREXIT_EXIT | NOERREXIT_RETURN | NOERREXIT_SIGNAL; if (EMULATION(EMULATE_KSH|EMULATE_SH)) { if (islogin) |