summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <schaefer@zsh.org>2022-04-14 16:39:34 -0700
committerBart Schaefer <schaefer@zsh.org>2022-04-14 16:39:34 -0700
commitf5c2f73301c9b611d77f02978a2f013d59a95e62 (patch)
treefe8e58a36b588b0541e513eead4a7ff9652a8f62
parentd24d7242fecec5a6d9db6f27f7439281dfa17021 (diff)
downloadzsh-f5c2f73301c9b611d77f02978a2f013d59a95e62.tar.gz
zsh-f5c2f73301c9b611d77f02978a2f013d59a95e62.tar.xz
zsh-f5c2f73301c9b611d77f02978a2f013d59a95e62.zip
50069: ChangeLog and test description for 50068
-rw-r--r--ChangeLog7
-rw-r--r--Test/C03traps.ztst2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c006bcf1..929cdec82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-04-14  Bart Schaefer  <schaefer@Macadamia>
+
+	* 50069: Test/C03traps.ztst: fix test description
+
+	* 50068: Etc/BUGS, Src/builtin.c, Test/C03traps.ztst: 'exit' in
+	trap causes calling function to return (fixes workers/44007)
+
 2022-04-14  Jun-ichi Takimoto  <takimoto-j@kba.biglobe.ne.jp>
 
 	* 50052: Test/V14system.ztst: do nothing when skipping the test
diff --git a/Test/C03traps.ztst b/Test/C03traps.ztst
index 3bd2958cb..8d1283552 100644
--- a/Test/C03traps.ztst
+++ b/Test/C03traps.ztst
@@ -901,7 +901,7 @@ F:Must be tested with a top-level script rather than source or function
  fn trap1 trap2
  echo out2
  '
--:(workers/44007) function execution continues after 'exit' in trap
+-:'exit' in trap causes calling function to return
 >out1
 >fn1
 >trap1