[slime-cvs] CVS slime

[CVS User trittweiler]

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

Modified Files:
	swank-sbcl.lisp ChangeLog 
Log Message:
	* swank-sbcl.lisp (call-with-debugger-hook): Oops, removed the
	binding for *DEBUGGER-HOOK*. Fix that.
	(make-invoke-debugger-hook): Do nothing if hook is NIL.


--- /project/slime/cvsroot/slime/swank-sbcl.lisp	2009/12/10 22:21:09	1.258
+++ /project/slime/cvsroot/slime/swank-sbcl.lisp	2009/12/10 23:07:38	1.259
@@ -909,11 +909,12 @@
 ;;; feature.
 
 (defun make-invoke-debugger-hook (hook)
-  #'(sb-int:named-lambda swank-invoke-debugger-hook
-        (condition old-hook)
-      (if *debugger-hook*
-          nil           ; decline, *DEBUGGER-HOOK* will be tried next.
-          (funcall hook condition old-hook))))
+  (when hook
+    #'(sb-int:named-lambda swank-invoke-debugger-hook
+          (condition old-hook)
+        (if *debugger-hook*
+            nil         ; decline, *DEBUGGER-HOOK* will be tried next.
+            (funcall hook condition old-hook)))))
 
 (defun set-break-hook (hook)
   (setq sb-ext:*invoke-debugger-hook* (make-invoke-debugger-hook hook)))
@@ -976,7 +977,8 @@
     (invoke-restart 'sb-ext:step-out)))
 
 (defimplementation call-with-debugger-hook (hook fun)
-  (let (#+#.(swank-backend::sbcl-with-new-stepper-p)
+  (let ((*debugger-hook* hook)
+        #+#.(swank-backend::sbcl-with-new-stepper-p)
         (sb-ext:*stepper-hook*
          (lambda (condition)
            (typecase condition
--- /project/slime/cvsroot/slime/ChangeLog	2009/12/10 22:21:09	1.1930
+++ /project/slime/cvsroot/slime/ChangeLog	2009/12/10 23:07:38	1.1931
@@ -1,3 +1,9 @@
+2009-12-11  Tobias C. Rittweiler <tcr at freebits.de>
+
+	* swank-sbcl.lisp (call-with-debugger-hook): Oops, removed the
+	binding for *DEBUGGER-HOOK*. Fix that.
+	(make-invoke-debugger-hook): Do nothing if hook is NIL.
+
 2009-12-10  Tobias C. Rittweiler <tcr at freebits.de>
 
 	* swank-backend.lisp (*debug-swank-backend*): New variable. If