[slime-cvs] CVS slime

[CVS User sboukarev]

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

Modified Files:
	ChangeLog swank.lisp 
Log Message:
* swank.lisp (format-restarts-for-emacs): Add
without-printing-errors around restart printing.


--- /project/slime/cvsroot/slime/ChangeLog	2011/03/09 20:09:57	1.2184
+++ /project/slime/cvsroot/slime/ChangeLog	2011/03/13 21:11:12	1.2185
@@ -1,3 +1,8 @@
+2011-03-13  Stas Boukarev  <stassats at gmail.com>
+
+	* swank.lisp (format-restarts-for-emacs): Add
+	without-printing-errors around restart printing.
+
 2011-03-09  Helmut Eller  <heller at common-lisp.net>
 
 	Remove slime-sexp-at-point-for-macroexpansion.
--- /project/slime/cvsroot/slime/swank.lisp	2011/02/04 14:26:45	1.740
+++ /project/slime/cvsroot/slime/swank.lisp	2011/03/13 21:11:13	1.741
@@ -2599,8 +2599,12 @@
     (loop for restart in *sldb-restarts* collect 
           (list (format nil "~:[~;*~]~a" 
                         (eq restart *sldb-quit-restart*)
-                        (restart-name restart) )
-                (princ-to-string restart)))))
+                        (restart-name restart))
+                (with-output-to-string (stream)
+                  (without-printing-errors (:object restart
+                                            :stream stream
+                                            :msg "<<error printing restart>>")
+                    (princ restart stream)))))))
 
 ;;;;; SLDB entry points