summaryrefslogtreecommitdiff
path: root/Src/builtin.c
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2022-05-08 05:47:08 +0200
committerAxel Beckert <abe@deuxchevaux.org>2022-05-08 05:47:08 +0200
commit9529af723604dfe1c8152db11e1d216621c898d5 (patch)
treea512727d6ea897041fca8a6b09f7d5ddd753d7f1 /Src/builtin.c
parentb09f4483416c54c1782824633dfabaf2ec0265b6 (diff)
parent32100208ecc26f8b70a0dbef6298bfd2b823d8d0 (diff)
downloadzsh-9529af723604dfe1c8152db11e1d216621c898d5.tar.gz
zsh-9529af723604dfe1c8152db11e1d216621c898d5.zip
New upstream version 5.8.1.3-test
Diffstat (limited to 'Src/builtin.c')
-rw-r--r--Src/builtin.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Src/builtin.c b/Src/builtin.c
index 8ef678b22..1cef7cce8 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -5720,6 +5720,8 @@ bin_break(char *name, char **argv, UNUSED(Options ops), int func)
* a bad job.
*/
if (stopmsg || (zexit(0, ZEXIT_DEFERRED), !stopmsg)) {
+ if (trap_state)
+ trap_state = TRAP_STATE_FORCE_RETURN;
retflag = 1;
breaks = loops;
exit_pending = 1;
@@ -5858,6 +5860,7 @@ zexit(int val, enum zexit_t from_where)
/* send SIGHUP to any jobs left running */
killrunjobs(from_where == ZEXIT_SIGNAL);
}
+ cleanfilelists();
if (isset(RCS) && interact) {
if (!nohistsave) {
int writeflags = HFILE_USE_OPTIONS;