X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-error.lisp;h=32f71adc1bcdb98d55a505c49c070bf17162d36c;hb=3a10f894e7867fa2c27a3af05380abc3247f728d;hp=17e8600f09a8fbc0499e5cb49c2adc8f09e25c34;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git

diff --git a/src/code/cold-error.lisp b/src/code/cold-error.lisp
index 17e8600..32f71ad 100644
--- a/src/code/cold-error.lisp
+++ b/src/code/cold-error.lisp
@@ -32,7 +32,7 @@
 	  (*break-on-signals* nil))
       (when (typep condition old-bos)
 	(/noshow0 "doing BREAK in because of *BREAK-ON-SIGNALS*")
-	(break "~A~%BREAK was entered because of *BREAK-ON-SIGNALS* (now NIL)."
+	(break "~A~%BREAK was entered because of *BREAK-ON-SIGNALS* (now rebound to NIL)."
 	       condition)))
     (loop
       (unless *handler-clusters*
@@ -84,7 +84,7 @@
 (eval-when (:compile-toplevel :execute)
   (defmacro-mundanely maybe-find-stack-top-hint ()
     `(or sb!debug:*stack-top-hint*
-	 (nth-value 1 (sb!kernel:find-caller-name-and-frame)))))
+	 (nth-value 1 (find-caller-name-and-frame)))))
 
 (defun error (datum &rest arguments)
   #!+sb-doc
@@ -98,7 +98,7 @@
 	       (sb!impl::cold-print argument))
   (/show0 "done cold-printing ERROR arguments")
 
-  (sb!kernel:infinite-error-protect
+  (infinite-error-protect
     (let ((condition (coerce-to-condition datum arguments
 					  'simple-error 'error))
 	  (sb!debug:*stack-top-hint* (maybe-find-stack-top-hint)))
@@ -110,15 +110,13 @@
       (invoke-debugger condition))))
 
 (defun cerror (continue-string datum &rest arguments)
-  (sb!kernel:infinite-error-protect
+  (infinite-error-protect
     (with-simple-restart
 	(continue "~A" (apply #'format nil continue-string arguments))
-      (let ((condition (if (typep datum 'condition)
-			   datum
-			   (coerce-to-condition datum
-						arguments
-						'simple-error
-						'error)))
+      (let ((condition (coerce-to-condition datum
+					    arguments
+					    'simple-error
+					    'error))
 	    (sb!debug:*stack-top-hint* (maybe-find-stack-top-hint)))
 	(with-condition-restarts condition (list (find-restart 'continue))
 	  (let ((sb!debug:*stack-top-hint* nil))
@@ -128,11 +126,11 @@
 
 ;;; like BREAK, but without rebinding *DEBUGGER-HOOK* to NIL, so that
 ;;; we can use it in system code (e.g. in SIGINT handling) without
-;;; messing up --noprogrammer mode (which works by setting
+;;; messing up --disable-debugger mode (which works by setting
 ;;; *DEBUGGER-HOOK*); or for that matter, without messing up ordinary
 ;;; applications which try to do similar things with *DEBUGGER-HOOK*
 (defun %break (what &optional (datum "break") &rest arguments)
-  (sb!kernel:infinite-error-protect
+  (infinite-error-protect
     (with-simple-restart (continue "Return from ~S." what)
       (let ((sb!debug:*stack-top-hint* (maybe-find-stack-top-hint)))
 	(invoke-debugger
@@ -162,7 +160,7 @@
 	(/show0 "ignoring WARN in cold init, arguments=..")
 	#!+sb-show (dolist (argument arguments)
 		     (sb!impl::cold-print argument)))
-      (sb!kernel:infinite-error-protect
+      (infinite-error-protect
        (/show0 "doing COERCE-TO-CONDITION")
        (let ((condition (coerce-to-condition datum arguments
 					     'simple-warning 'warn)))