X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fcold-error.lisp;h=7718c2937cf8bbe9376643344e9fd82613257ce8;hb=6cc71ab8ffad49f43895ad0a1df6885c81876687;hp=d35f10776350a1eb3c211b60217478000244f145;hpb=a10eba73462a7203914114f3a4bdac98c741ec08;p=sbcl.git

diff --git a/src/code/cold-error.lisp b/src/code/cold-error.lisp
index d35f107..7718c29 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*
@@ -50,33 +50,6 @@
     (/noshow0 "returning from SIGNAL")
     nil))
 
-;;; a utility for SIGNAL, ERROR, CERROR, WARN, and INVOKE-DEBUGGER:
-;;; Parse the hairy argument conventions into a single argument that's
-;;; directly usable by all the other routines.
-(defun coerce-to-condition (datum arguments default-type fun-name)
-  (cond ((typep datum 'condition)
-	 (if arguments
-	     (cerror "Ignore the additional arguments."
-		     'simple-type-error
-		     :datum arguments
-		     :expected-type 'null
-		     :format-control "You may not supply additional arguments ~
-				     when giving ~S to ~S."
-		     :format-arguments (list datum fun-name)))
-	 datum)
-	((symbolp datum) ; roughly, (SUBTYPEP DATUM 'CONDITION)
-	 (apply #'make-condition datum arguments))
-	((or (stringp datum) (functionp datum))
-	 (make-condition default-type
-			 :format-control datum
-			 :format-arguments arguments))
-	(t
-	 (error 'simple-type-error
-		:datum datum
-		:expected-type '(or symbol string)
-		:format-control "bad argument to ~S: ~S"
-		:format-arguments (list fun-name datum)))))
-
 ;;; a shared idiom in ERROR, CERROR, and BREAK: The user probably
 ;;; doesn't want to hear that the error "occurred in" one of these
 ;;; functions, so we try to point the top of the stack to our caller
@@ -126,7 +99,7 @@
 
 ;;; 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)