[armedbear-cvs] r13957 - trunk/abcl/src/org/armedbear/lisp

[rschlatte at common-lisp.net]

Author: rschlatte
Date: Mon Jun 11 03:44:13 2012
New Revision: 13957

Log:
Properly initialize documentation for effective slot definitions

Modified:
   trunk/abcl/src/org/armedbear/lisp/clos.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/clos.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/clos.lisp	Sun Jun 10 14:34:15 2012	(r13956)
+++ trunk/abcl/src/org/armedbear/lisp/clos.lisp	Mon Jun 11 03:44:13 2012	(r13957)
@@ -676,8 +676,8 @@
 (defun std-compute-effective-slot-definition (class name direct-slots)
   (let ((initer (find-if-not #'null direct-slots
                              :key 'slot-definition-initfunction))
-        (documentation (find-if-not #'null direct-slots
-                                    :key 'slot-definition-documentation))
+        (documentation-slot (find-if-not #'null direct-slots
+                                         :key 'slot-definition-documentation))
         (types (delete-duplicates
                 (delete t (mapcar #'slot-definition-type direct-slots))
                 :test #'equal))
@@ -703,7 +703,7 @@
      :type (cond ((null types) t)
                  ((= 1 (length types)) types)
                  (t (list* 'and types)))
-     :documentation documentation)))
+     :documentation (documentation documentation-slot t))))
 
 ;;; Standard instance slot access