X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Finit.lisp;h=236fc867fd8a6c0ba19094edceae2d004fb10134;hb=22aec7852f4861e5dab28cc0d619c24b62590dad;hp=2fc6eba1561be2f1837626a4a2b09512d7ca34a7;hpb=3d3ac32d4402ff3df488e69de7f05ca240cc67aa;p=sbcl.git

diff --git a/src/pcl/init.lisp b/src/pcl/init.lisp
index 2fc6eba..236fc86 100644
--- a/src/pcl/init.lisp
+++ b/src/pcl/init.lisp
@@ -132,11 +132,15 @@
             (loop for slotd in (class-slots class)
                   unless (initialize-slot-from-initarg class instance slotd)
                     collect slotd)))
-      (loop for slotd in initfn-slotds
-            when (and (not (eq :class (slot-definition-allocation slotd)))
-                      (or (eq t slot-names)
-                          (memq (slot-definition-name slotd) slot-names))) do
-              (initialize-slot-from-initfunction class instance slotd)))
+      (dolist (slotd initfn-slotds)
+	(if (eq (slot-definition-allocation slotd) :class)
+	    (when (or (eq t slot-names)
+		      (memq (slot-definition-name slotd) slot-names))
+	      (unless (slot-boundp-using-class class instance slotd)
+		(initialize-slot-from-initfunction class instance slotd)))
+	    (when (or (eq t slot-names)
+		      (memq (slot-definition-name slotd) slot-names))
+	      (initialize-slot-from-initfunction class instance slotd)))))
     instance))
 
 ;;; If initargs are valid return nil, otherwise signal an error.