about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/func.yo5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c170cf843..d4190cfd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-02  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
+
+	* unposted, c.f. 21799: Doc/Zsh/func.yo: documentation for
+	returns from TRAPNAL functions was wayward.
+
 2005-10-01  Wayne Davison  <wayned@users.sourceforge.net>
 
 	* unposted: Src/utils.c: changed PROMPT_SP to use the prompt-
diff --git a/Doc/Zsh/func.yo b/Doc/Zsh/func.yo
index 2f6445873..f596afef5 100644
--- a/Doc/Zsh/func.yo
+++ b/Doc/Zsh/func.yo
@@ -196,9 +196,8 @@ the shell and processes spawned by it will ignore tt(SIG)var(NAL).
 
 The return status from the function is handled specially.  If it is
 zero, the signal is assumed to have been handled, and execution continues
-normally.  Otherwise, the normal effect of the signal is produced;
-if this causes execution to terminate, the status returned to the shell is
-the status returned from the function.
+normally.  Otherwise, the shell will behave as interrupted except that
+the return status of the trap is retained.
 
 Programs terminated by uncaught signals typically return the status 128
 plus the signal number.  Hence the following causes the handler for