X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpcl%2Fmacros.lisp;h=8dd2df772798b772807cedee219d233813c14c48;hb=aebbc5aad31f7e55930c996a8c54f0a135e00894;hp=823994e0deb14085d5932eee6a6a47c4ebd7edd7;hpb=2d3cb6dba6461e98744eca2a1df4f770cea468ca;p=sbcl.git

diff --git a/src/pcl/macros.lisp b/src/pcl/macros.lisp
index 823994e..8dd2df7 100644
--- a/src/pcl/macros.lisp
+++ b/src/pcl/macros.lisp
@@ -108,8 +108,8 @@
 (defun find-class-from-cell (symbol cell &optional (errorp t))
   (or (find-class-cell-class cell)
       (and *create-classes-from-internal-structure-definitions-p*
-	   (structure-type-p symbol)
-	   (find-structure-class symbol))
+	   (or (structure-type-p symbol) (condition-type-p symbol))
+	   (ensure-non-standard-class symbol))
       (cond ((null errorp) nil)
 	    ((legal-class-name-p symbol)
 	     (error "There is no class named ~S." symbol))
@@ -160,8 +160,8 @@
 	   (or (find-class-cell-class ,class-cell)
 	       ,(if errorp
 		    `(find-class-from-cell ',symbol ,class-cell t)
-		    `(and (sb-kernel:classoid-cell-classoid
-			   ',(sb-kernel:find-classoid-cell symbol))
+		    `(and (classoid-cell-classoid
+			   ',(find-classoid-cell symbol))
 			  (find-class-from-cell ',symbol ,class-cell nil))))))
       form))