X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fcode%2Ferror.lisp;h=86e41d125096fc22e6ca1420e2c33c5815a2038d;hb=dfe6138af5c38d92568b6dac48e852c01be0ec8e;hp=b409a4fad79c78481111a93354931135441c1649;hpb=b1b85bbf17f686a0787304a04cf0e01e8216d038;p=sbcl.git

diff --git a/src/code/error.lisp b/src/code/error.lisp
index b409a4f..86e41d1 100644
--- a/src/code/error.lisp
+++ b/src/code/error.lisp
@@ -27,14 +27,14 @@
 ;;; single argument that's directly usable by all the other routines.
 (defun coerce-to-condition (datum arguments default-type fun-name)
   (cond ((typep datum 'condition)
-	 (if arguments
-	     (cerror "Ignore the additional arguments."
-		     'simple-type-error
-		     :datum arguments
-		     :expected-type 'null
-		     :format-control "You may not supply additional arguments ~
-                                      when giving ~S to ~S."
-		     :format-arguments (list datum fun-name)))
+	 (when (and arguments (not (eq fun-name 'cerror)))
+           (cerror "Ignore the additional arguments."
+                   'simple-type-error
+                   :datum arguments
+                   :expected-type 'null
+                   :format-control "You may not supply additional arguments ~
+                                    when giving ~S to ~S."
+                   :format-arguments (list datum fun-name)))
 	 datum)
 	((symbolp datum) ; roughly, (SUBTYPEP DATUM 'CONDITION)
 	 (apply #'make-condition datum arguments))