summaryrefslogtreecommitdiff
path: root/Src/builtin.c
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2022-05-08 05:47:24 +0200
committerAxel Beckert <abe@deuxchevaux.org>2022-05-08 05:47:24 +0200
commit5615b53bbf3578a91bab8658b38d0352433510e7 (patch)
treebdf29751a810afd43ab7497d47229ba64d5707e8 /Src/builtin.c
parent514524ee7be382a740e53e2a7c0247f2d68d7730 (diff)
parent9529af723604dfe1c8152db11e1d216621c898d5 (diff)
downloadzsh-5615b53bbf3578a91bab8658b38d0352433510e7.tar.gz
zsh-5615b53bbf3578a91bab8658b38d0352433510e7.zip
Update upstream source from tag 'upstream/5.8.1.3-test'
Update to upstream version '5.8.1.3-test' with Debian dir db59cf6a81e7a92e349f815dc21759ccb7ed689a
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;