diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2017-09-12 23:22:34 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2017-09-12 23:22:34 +0200 |
| commit | 4aaf06e6678dcead65d7226bd6bde3cffeb2cb2e (patch) | |
| tree | 5c8e2ac2c9a85e2e6568aed7120372e6efa074ac /Src/init.c | |
| parent | f33de64abf57611e59df72da230f3d0d6760c4c5 (diff) | |
| parent | 6ff4787e830f8edb3a7e32490a88a131e4b62f7f (diff) | |
| download | zsh-4aaf06e6678dcead65d7226bd6bde3cffeb2cb2e.tar.gz zsh-4aaf06e6678dcead65d7226bd6bde3cffeb2cb2e.zip | |
Merge tag 'zsh-5.4.2' into debian
Release 5.4.2
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) |