X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fdebug.lisp;h=69a135c69524a162635efe82babd4e2a18c18922;hb=240b0db303764545c982e9362a986243b535f7f4;hp=74fa1a98dc418617a24e63a2dc7ef0444eb7d2c3;hpb=758efae974a22a2b75fd5db6818a3c6165e4f699;p=sbcl.git

diff --git a/src/code/debug.lisp b/src/code/debug.lisp
index 74fa1a9..69a135c 100644
--- a/src/code/debug.lisp
+++ b/src/code/debug.lisp
@@ -740,7 +740,7 @@ reset to ~S."
        ;; regardless of what the debugger does afterwards.)
        (handler-case
 	   (format *error-output*
-		   "~2&~@<debugger invoked on condition of type ~S in thread ~A: ~
+		   "~2&~@<debugger invoked on a ~S in thread ~A: ~
                     ~2I~_~A~:>~%"
 		   (type-of *debug-condition*)
 		   (sb!thread:current-thread-id)
@@ -775,34 +775,29 @@ reset to ~S."
        ;; been converted to behave this way. -- WHN 2000-11-16)
 
        (unwind-protect
-       (let (;; FIXME: Rebinding *STANDARD-OUTPUT* here seems wrong,
-	     ;; violating the principle of least surprise, and making
-	     ;; it impossible for the user to do reasonable things
-	     ;; like using PRINT at the debugger prompt to send output
-	     ;; to the program's ordinary (possibly
-	     ;; redirected-to-a-file) *STANDARD-OUTPUT*. (CMU CL
-	     ;; used to rebind *STANDARD-INPUT* here too, but that's
-	     ;; been fixed already.)
-	     (*standard-output* *debug-io*)
-	     ;; This seems reasonable: e.g. if the user has redirected
-	     ;; *ERROR-OUTPUT* to some log file, it's probably wrong
-	     ;; to send errors which occur in interactive debugging to
-	     ;; that file, and right to send them to *DEBUG-IO*.
-	     (*error-output* *debug-io*))
-	 (unless (typep condition 'step-condition)
-	   (when *debug-beginner-help-p*
-	     (format *debug-io*
-		     "~%~@<Within the debugger, you can type HELP for help. ~
-                      At any command prompt (within the debugger or not) you ~
-                      can type (SB-EXT:QUIT) to terminate the SBCL ~
-                      executable. The condition which caused the debugger to ~
-                      be entered is bound to ~S. You can suppress this ~
-                      message by clearing ~S.~:@>~2%"
-		     '*debug-condition*
-		     '*debug-beginner-help-p*))
-	   (show-restarts *debug-restarts* *debug-io*))
+	    (let (;; FIXME: Rebinding *STANDARD-OUTPUT* here seems wrong,
+		  ;; violating the principle of least surprise, and making
+		  ;; it impossible for the user to do reasonable things
+		  ;; like using PRINT at the debugger prompt to send output
+		  ;; to the program's ordinary (possibly
+		  ;; redirected-to-a-file) *STANDARD-OUTPUT*. (CMU CL
+		  ;; used to rebind *STANDARD-INPUT* here too, but that's
+		  ;; been fixed already.)
+		  (*standard-output* *debug-io*)
+		  ;; This seems reasonable: e.g. if the user has redirected
+		  ;; *ERROR-OUTPUT* to some log file, it's probably wrong
+		  ;; to send errors which occur in interactive debugging to
+		  ;; that file, and right to send them to *DEBUG-IO*.
+		  (*error-output* *debug-io*))
+	      (unless (typep condition 'step-condition)
+		(when *debug-beginner-help-p*
+		  (format *debug-io*
+			  "~%~@<You can type HELP for debugger help, or ~
+                                (SB-EXT:QUIT) to exit from SBCL.~:@>~2%"))
+		(show-restarts *debug-restarts* *debug-io*))
 	      (internal-debug))
-	 (when background-p (sb!thread::release-foreground)))))))
+	 (when background-p
+	   (sb!thread::release-foreground)))))))
 
 ;;; this function is for use in *INVOKE-DEBUGGER-HOOK* when ordinary
 ;;; ANSI behavior has been suppressed by command-line