about summary refs log tree commit diff
path: root/Doc/Zsh/func.yo
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2011-01-13 09:31:07 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2011-01-13 09:31:07 +0000
commit11075eff1b87507b2d5bd95210afeb47a91848e1 (patch)
tree50e0bbe55c8c8dca428217b28217751e380b59ba /Doc/Zsh/func.yo
parentef4055d97c7af12c6dc8206a5e9872c770fea687 (diff)
downloadzsh-11075eff1b87507b2d5bd95210afeb47a91848e1.tar.gz
zsh-11075eff1b87507b2d5bd95210afeb47a91848e1.tar.xz
zsh-11075eff1b87507b2d5bd95210afeb47a91848e1.zip
c.f. 28628: some extra notes on traps
Diffstat (limited to 'Doc/Zsh/func.yo')
-rw-r--r--Doc/Zsh/func.yo8
1 files changed, 6 insertions, 2 deletions
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()