[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog slime.el swank.lisp 
Log Message:
Be a bit more careful when computing the toplevel restart.

* swank.lisp (throw-to-toplevel): Test *sldb-quit-restart* for
nilness.
* sldb-quit (sldb-quit): Show the returned value in brackets.

--- /project/slime/cvsroot/slime/ChangeLog	2008/12/09 07:47:59	1.1595
+++ /project/slime/cvsroot/slime/ChangeLog	2008/12/09 07:48:10	1.1596
@@ -1,5 +1,13 @@
 2008-12-09  Helmut Eller  <heller at common-lisp.net>
 
+	Be a bit more careful when computing the toplevel restart.
+
+	* swank.lisp (throw-to-toplevel): Test *sldb-quit-restart* for
+	nilness.
+	* sldb-quit (sldb-quit): Show the returned value in brackets.
+
+2008-12-09  Helmut Eller  <heller at common-lisp.net>
+
 	Make the modeline a bit shorter.
 
 	* slime.el (slime-compute-modeline-string): Remove PKG: and CON:
--- /project/slime/cvsroot/slime/slime.el	2008/12/09 07:47:59	1.1073
+++ /project/slime/cvsroot/slime/slime.el	2008/12/09 07:48:10	1.1074
@@ -7399,7 +7399,7 @@
   (interactive)
   (assert sldb-restarts () "sldb-quit called outside of sldb buffer")
   (slime-rex () ('(swank:throw-to-toplevel))
-    ((:ok _) (error "sldb-quit returned"))
+    ((:ok x) (error "sldb-quit returned [%s]" x))
     ((:abort))))
 
 (defun sldb-continue ()
--- /project/slime/cvsroot/slime/swank.lisp	2008/11/22 15:14:51	1.610
+++ /project/slime/cvsroot/slime/swank.lisp	2008/12/09 07:48:10	1.611
@@ -2363,9 +2363,10 @@
 (defslimefun throw-to-toplevel ()
   "Invoke the ABORT-REQUEST restart abort an RPC from Emacs.
 If we are not evaluating an RPC then ABORT instead."
-  (let ((restart (find-restart *sldb-quit-restart*)))
+  (let ((restart (and *sldb-quit-restart*
+                      (find-restart *sldb-quit-restart*))))
     (cond (restart (invoke-restart restart))
-          (t "Toplevel restart found"))))
+          (t "No toplevel restart active"))))
 
 (defslimefun invoke-nth-restart-for-emacs (sldb-level n)
   "Invoke the Nth available restart.
@@ -2909,6 +2910,7 @@
 
 
 ;;;; Inspecting
+
 (defvar *inspector-verbose* nil)
 
 (defstruct (inspector-state (:conc-name istate.))