diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Doc/Zsh/func.yo | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index aced503c8..d32cfd749 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-01-13 Peter Stephenson <pws@csr.com> + + * c.f. 28628: Doc/Zsh/func.yo: some extra notes on traps. + 2011-01-11 Peter Stephenson <p.w.stephenson@ntlworld.com> * unposted: Src/params.c: fix return types in 28617. @@ -14106,5 +14110,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5181 $ +* $Revision: 1.5182 $ ***************************************************** diff --git a/Doc/Zsh/func.yo b/Doc/Zsh/func.yo index 6becc6228..28bc6329a 100644 --- a/Doc/Zsh/func.yo +++ b/Doc/Zsh/func.yo @@ -348,7 +348,10 @@ enditem() findex(trap, use of) The functions beginning `tt(TRAP)' may alternatively be defined with the -tt(trap) builtin: this may be preferable for some uses. The forms +tt(trap) builtin: this may be preferable for some uses. Setting a trap +with one form removes any trap of the other form for the same signal; +removing a trap in either form removes all traps for the same signal. +The forms example(TRAPNAL+LPAR()RPAR() { # code @@ -371,5 +374,6 @@ itemiz(The return status from function traps is special, whereas a return from a list trap causes the surrounding context to return with the given status.) itemiz(Function traps are not reset within subshells, in accordance with -zsh behaviour; list traps are reset, in accordance with POSIX behaviour.) +zsh behaviour; list traps are reset, in accordance with POSIX +behaviour.) enditemize() |