X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fearly-target-error.lisp;h=216a9fedf3ca1350b56d7b978c3390a680bbc79f;hb=a1a2c079c7654defb618baad0dddcf0eaf2ce64f;hp=ddf6def0fc276f7b99e0ddaf14823d71f58bbd7c;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git

diff --git a/src/code/early-target-error.lisp b/src/code/early-target-error.lisp
index ddf6def..216a9fe 100644
--- a/src/code/early-target-error.lisp
+++ b/src/code/early-target-error.lisp
@@ -10,7 +10,7 @@
 ;;;; provided with absolutely no warranty. See the COPYING and CREDITS
 ;;;; files for more information.
 
-(in-package "SB!CONDITIONS")
+(in-package "SB!KERNEL")
 
 ;;;; restarts
 
@@ -43,7 +43,7 @@
 	    (res restart))))
       (res))))
 
-(defstruct restart
+(defstruct (restart (:copier nil))
   name
   function
   report-function
@@ -314,9 +314,10 @@
 				bindings))
 		*handler-clusters*)))
      (multiple-value-prog1
-      ,@forms
-      ;; Wait for any float exceptions
-      #!+x86 (float-wait))))
+	 (progn
+	   ,@forms)
+       ;; Wait for any float exceptions.
+       #!+x86 (float-wait))))
 
 ;;;; HANDLER-CASE and IGNORE-ERRORS
 
@@ -388,7 +389,7 @@
 
 (defun assert-error (assertion places datum &rest arguments)
   (let ((cond (if datum
-		(sb!conditions::coerce-to-condition datum
+		(coerce-to-condition datum
 						    arguments
 						    'simple-error
 						    'error)
@@ -442,7 +443,7 @@
 
 (defun case-body-error (name keyform keyform-value expected-type keys)
   (restart-case
-      (error 'sb!conditions::case-failure
+      (error 'case-failure
 	     :name name
 	     :datum keyform-value
 	     :expected-type expected-type