[slime-cvs] CVS slime/contrib

[CVS User sboukarev]

Update of /project/slime/cvsroot/slime/contrib
In directory tiger.common-lisp.net:/tmp/cvs-serv5745

Modified Files:
	ChangeLog swank-arglists.lisp 
Log Message:
* swank-arglists.lisp (extra-keywords/slots): Check for
slot-definition-initfunction being present before calling
slot-definition-initform.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2012/08/04 22:35:13	1.549
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2012/08/13 20:50:34	1.550
@@ -1,3 +1,9 @@
+2012-08-13  Stas Boukarev  <stassats at gmail.com>
+
+	* swank-arglists.lisp (extra-keywords/slots): Check for
+	slot-definition-initfunction being present before calling
+	slot-definition-initform.
+
 2012-08-04  Stas Boukarev  <stassats at gmail.com>
 
 	* swank-arglists.lisp (test-print-arglist): bind
--- /project/slime/cvsroot/slime/contrib/swank-arglists.lisp	2012/08/04 22:35:13	1.74
+++ /project/slime/cvsroot/slime/contrib/swank-arglists.lisp	2012/08/13 20:50:34	1.75
@@ -743,13 +743,14 @@
           (values (swank-mop:class-slots class) nil)
           (values (swank-mop:class-direct-slots class) t))
     (let ((slot-init-keywords
-           (loop for slot in slots append
-                 (mapcar (lambda (initarg)
-                           (make-keyword-arg
-                            initarg
-                            (swank-mop:slot-definition-name slot)
-                            (swank-mop:slot-definition-initform slot)))
-                         (swank-mop:slot-definition-initargs slot)))))
+            (loop for slot in slots append
+                  (mapcar (lambda (initarg)
+                            (make-keyword-arg
+                             initarg
+                             (swank-mop:slot-definition-name slot)
+                             (and (swank-mop:slot-definition-initfunction slot)
+                                  (swank-mop:slot-definition-initform slot))))
+                          (swank-mop:slot-definition-initargs slot)))))
       (values slot-init-keywords allow-other-keys-p))))
 
 (defun extra-keywords/make-instance (operator &rest args)