merge from 1.8 branch

[bpt/guile.git] / ice-9 / stack-catch.scm

diff --git a/ice-9/stack-catch.scm b/ice-9/stack-catch.scm
index ff160f7..81faca0 100644 (file)
--- a/ice-9/stack-catch.scm
+++ b/ice-9/stack-catch.scm
@@ -1,21 +1,20 @@
 ;;; installed-scm-file
 
-;;;;   Copyright (C) 2001 Free Software Foundation, Inc.
+;;;;   Copyright (C) 2001, 2006 Free Software Foundation, Inc.
 ;;;; 
-;;;; This program is free software; you can redistribute it and/or modify
-;;;; it under the terms of the GNU General Public License as published by
-;;;; the Free Software Foundation; either version 2, or (at your option)
-;;;; any later version.
+;;;; This library is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU Lesser General Public
+;;;; License as published by the Free Software Foundation; either
+;;;; version 2.1 of the License, or (at your option) any later version.
 ;;;; 
-;;;; This program is distributed in the hope that it will be useful,
+;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;;; Lesser General Public License for more details.
 ;;;; 
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with this software; see the file COPYING.  If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 ;;;; 
 
 (define-module (ice-9 stack-catch)
@@ -28,7 +27,7 @@ current stack state in the @var{the-last-stack} fluid, for the purpose
 of debugging or re-throwing of an error.  If thunk throws to the
 symbol @var{key}, then @var{handler} is invoked this way:\n
 @example
-(handler key args ...)
+ (handler key args ...)
 @end example\n
 @var{key} is a symbol or #t.\n
 @var{thunk} takes no arguments.  If @var{thunk} returns normally, that
@@ -39,8 +38,6 @@ up the call chain is invoked.\n
 If the key is @code{#t}, then a throw to @emph{any} symbol will match
 this call to @code{catch}."
   (catch key
-        (lambda ()
-          (lazy-catch key
-                      thunk
-                      lazy-handler-dispatch))
-        handler))
+        thunk
+        handler
+        lazy-handler-dispatch))