[slime-cvs] CVS slime/contrib

[CVS User trittweiler]

Update of /project/slime/cvsroot/slime/contrib
In directory cl-net:/tmp/cvs-serv12573

Modified Files:
	swank-arglists.lisp ChangeLog 
Log Message:
	* swank-arglists.lisp (extra-keywords/make-instance)
	(extra-keywords/change-class): Wrap call to CLASS-PROTOTYPE in an
	IGNORE-ERRORS because computing a class-prototype involves
	evaluating initforms which may be calls to ERROR.


--- /project/slime/cvsroot/slime/contrib/swank-arglists.lisp	2009/11/05 17:47:09	1.41
+++ /project/slime/cvsroot/slime/contrib/swank-arglists.lisp	2009/11/13 21:04:25	1.42
@@ -758,11 +758,13 @@
               (applicable-methods-keywords
                #'allocate-instance (list class))
             (multiple-value-bind (initialize-instance-keywords ii-aokp)
-                (applicable-methods-keywords
-                 #'initialize-instance (list (swank-mop:class-prototype class)))
-              (multiple-value-bind (shared-initialize-keywords si-aokp)
+                (ignore-errors
                   (applicable-methods-keywords
-                   #'shared-initialize (list (swank-mop:class-prototype class) t))
+                   #'initialize-instance (list (swank-mop:class-prototype class))))
+              (multiple-value-bind (shared-initialize-keywords si-aokp)
+                  (ignore-errors
+                    (applicable-methods-keywords
+                     #'shared-initialize (list (swank-mop:class-prototype class) t)))
                 (values (append slot-init-keywords
                                 allocate-instance-keywords
                                 initialize-instance-keywords
@@ -780,8 +782,9 @@
             (extra-keywords/slots class)
           (declare (ignore class-aokp))
           (multiple-value-bind (shared-initialize-keywords si-aokp)
-              (applicable-methods-keywords
-               #'shared-initialize (list (swank-mop:class-prototype class) t))
+              (ignore-errors
+                (applicable-methods-keywords
+                 #'shared-initialize (list (swank-mop:class-prototype class) t)))
             ;; FIXME: much as it would be nice to include the
             ;; applicable keywords from
             ;; UPDATE-INSTANCE-FOR-DIFFERENT-CLASS, I don't really see
--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/11/07 02:04:56	1.273
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/11/13 21:04:26	1.274
@@ -1,3 +1,10 @@
+2009-11-13  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	* swank-arglists.lisp (extra-keywords/make-instance)
+	(extra-keywords/change-class): Wrap call to CLASS-PROTOTYPE in an
+	IGNORE-ERRORS because computing a class-prototype involves
+	evaluating initforms which may be calls to ERROR.
+
 2009-11-07  Stas Boukarev  <stassats at gmail.com>
 
 	* slime-package-fu.el (slime-find-package-definition-regexp): Go