[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog swank-backend.lisp swank-clisp.lisp swank.lisp 
Log Message:
* swank-backend.lisp (compute-sane-restarts): Deleted. Use plain
compute restarts instead.

--- /project/slime/cvsroot/slime/ChangeLog	2008/10/17 21:27:08	1.1561
+++ /project/slime/cvsroot/slime/ChangeLog	2008/10/17 21:27:16	1.1562
@@ -1,5 +1,10 @@
 2008-10-17  Helmut Eller  <heller at common-lisp.net>
 
+	* swank-backend.lisp (compute-sane-restarts): Deleted. Use plain
+	compute restarts instead.
+
+2008-10-17  Helmut Eller  <heller at common-lisp.net>
+
 	* swank.lisp (call-with-retry-restart): Implement this a little
 	less confusing.
 
--- /project/slime/cvsroot/slime/swank-backend.lisp	2008/10/17 21:26:53	1.157
+++ /project/slime/cvsroot/slime/swank-backend.lisp	2008/10/17 21:27:16	1.158
@@ -643,13 +643,6 @@
 user without (re)entering the debugger by wrapping them as
 `sldb-condition's."))
 
-(definterface compute-sane-restarts (condition)
-  "This is an opportunity for Lisps such as CLISP to remove
-unwanted restarts from the output of CL:COMPUTE-RESTARTS,
-otherwise it should simply call CL:COMPUTE-RESTARTS, which is
-what the default implementation does."
-  (compute-restarts condition))
-
 ;;; The following functions in this section are supposed to be called
 ;;; within the dynamic contour of CALL-WITH-DEBUGGING-ENVIRONMENT only.
 
--- /project/slime/cvsroot/slime/swank-clisp.lisp	2008/10/17 21:26:53	1.81
+++ /project/slime/cvsroot/slime/swank-clisp.lisp	2008/10/17 21:27:16	1.82
@@ -351,13 +351,6 @@
     (loop for f in (subseq bt start (min (or end len) len))
           collect f)))
 
-;;; CLISP's REPL sets up an ABORT restart that kills SWANK.  Here we
-;;; can omit that restart so that users don't select it by mistake.
-(defimplementation compute-sane-restarts (condition)
-  ;; The outermost restart is specified to be the last element of the
-  ;; list, hopefully that's our unwanted ABORT restart.
-  (butlast (compute-restarts condition)))
-
 (defimplementation print-frame (frame stream)
   (let* ((str (frame-to-string frame)))
     (write-string (extract-frame-line str)
--- /project/slime/cvsroot/slime/swank.lisp	2008/10/17 21:27:08	1.605
+++ /project/slime/cvsroot/slime/swank.lisp	2008/10/17 21:27:16	1.606
@@ -2196,7 +2196,7 @@
 
 (defun debug-in-emacs (condition)
   (let ((*swank-debugger-condition* condition)
-        (*sldb-restarts* (compute-sane-restarts condition))
+        (*sldb-restarts* (compute-restarts condition))
         (*package* (or (and (boundp '*buffer-package*)
                             (symbol-value '*buffer-package*))
                        *package*))