0.pre8.5:

[sbcl.git] / src / pcl / braid.lisp

diff --git a/src/pcl/braid.lisp b/src/pcl/braid.lisp
index 9a36654..b256c00 100644 (file)
--- a/src/pcl/braid.lisp
+++ b/src/pcl/braid.lisp
@@ -65,7 +65,7 @@
                                              (slots-init nil slots-init-p))
   (let ((fin (%make-pcl-funcallable-instance nil nil
                                             (get-instance-hash-code))))
-    (set-funcallable-instance-fun
+    (set-funcallable-instance-function
      fin
      #'(instance-lambda (&rest args)
         (declare (ignore args))
@@ -547,10 +547,9 @@
                                         :metaclass metaclass :name name
                                         :direct-superclasses supers
                                         :direct-slots slots)
-              (let ((supers (nsubstitute t 'instance supers)))
-                (ensure-class-using-class name nil
-                                          :metaclass metaclass :name name
-                                          :direct-superclasses supers))))))
+              (ensure-class-using-class name nil
+                                        :metaclass metaclass :name name
+                                        :direct-superclasses supers)))))
     (cond ((structure-type-p name)
           (ensure 'structure-class
                   (mapcar #'slot-initargs-from-structure-slotd