[slime-cvs] CVS update: slime/swank.lisp

[Helmut Eller]

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

Modified Files:
	swank.lisp 
Log Message:
(simple-serve-requests): Add an extra abort restart.

(connection-info): Rename :type-name to :name.

Date: Mon Oct 31 09:22:15 2005
Author: heller

Index: slime/swank.lisp
diff -u slime/swank.lisp:1.349 slime/swank.lisp:1.350
--- slime/swank.lisp:1.349	Sun Oct 30 16:07:07 2005
+++ slime/swank.lisp	Mon Oct 31 09:22:11 2005
@@ -696,7 +696,9 @@
 
 (defun simple-serve-requests (connection)
   (with-reader-error-handler (connection)
-    (unwind-protect (loop (handle-request connection))
+    (unwind-protect (loop (with-simple-restart 
+                              (abort "Return to SLIME top-level.")
+                            (handle-request connection)))
       (close-connection connection))))
 
 (defun read-from-socket-io ()
@@ -1085,7 +1087,7 @@
   (setq *slime-features* *features*)
   `(:pid ,(getpid) :style ,(connection.communication-style *emacs-connection*)
     :lisp-implementation (:type ,(lisp-implementation-type)
-                          :type-name ,(lisp-implementation-type-name)
+                          :name ,(lisp-implementation-type-name)
                           :version ,(lisp-implementation-version))
     :machine (:instance ,(machine-instance)
               :type ,(machine-type)