[slime-cvs] CVS slime

[heller]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv31430

Modified Files:
	swank.lisp 
Log Message:
(handle-request): Use 'abort as restart name, but
bind *sldb-quit-restart* to the restart returned by find-restart.
Also use a slighly friendlier message, because newbies seem to
invoke the ABORT restart instead of pressing q in the debugger.


--- /project/slime/cvsroot/slime/swank.lisp	2007/01/12 00:06:56	1.455
+++ /project/slime/cvsroot/slime/swank.lisp	2007/01/12 07:49:05	1.456
@@ -595,14 +595,18 @@
       (when socket
         (close-socket socket)))))
 
+(defvar *sldb-quit-restart* 'abort
+  "What restart should swank attempt to invoke when the user sldb-quits.")
+
 (defun handle-request (connection)
   "Read and process one request.  The processing is done in the extent
 of the toplevel restart."
   (assert (null *swank-state-stack*))
   (let ((*swank-state-stack* '(:handle-request)))
     (with-connection (connection)
-      (with-simple-restart (abort-request "Abort handling SLIME request.")
-        (read-from-emacs)))))
+      (with-simple-restart (abort "Return to SLIME's top level.")
+        (let ((*sldb-quit-restart* (find-restart 'abort)))
+          (read-from-emacs))))))
 
 (defun current-socket-io ()
   (connection.socket-io *emacs-connection*))
@@ -2505,7 +2509,9 @@
              (let ((i (car values)))
                (format nil "~A~D (#x~X, #o~O, #b~B)" 
                        *echo-area-prefix* i i i i)))
-            (t (format nil "~A~{~S~^, ~}" *echo-area-prefix* values))))))
+            (t (with-output-to-string (s)
+                 (pprint-logical-block (s values :prefix *echo-area-prefix*)
+                   (format s "~{~S~^, ~}" values))))))))
 
 (defslimefun interactive-eval (string)
   (with-buffer-syntax ()
@@ -2795,9 +2801,6 @@
 (defvar *sldb-stepping-p* nil
   "True during execution of a step command.")
 
-(defvar *sldb-quit-restart* 'abort-request
-  "What restart should swank attempt to invoke when the user sldb-quits.")
-
 (defun debug-in-emacs (condition)
   (let ((*swank-debugger-condition* condition)
         (*sldb-restarts* (compute-restarts condition))