X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fir1report.lisp;h=ea341140ddffcd0b5529e9ed640c290f2a94c4f8;hb=ff92598854bf7cae8d57fe49cef4d9a98e1ab345;hp=6828f90e1c9995df803a3cf5f8060391d613be7e;hpb=0794cd3908a441222f430ba0cf3bb7c3e1a96c63;p=sbcl.git

diff --git a/src/compiler/ir1report.lisp b/src/compiler/ir1report.lisp
index 6828f90..ea34114 100644
--- a/src/compiler/ir1report.lisp
+++ b/src/compiler/ir1report.lisp
@@ -383,16 +383,9 @@
 		(style-warning 'style-warning)
 		(warning 'warning)
 		((or error compiler-error) 'error))))
-    (multiple-value-bind (format-string format-args)
-	(if (typep condition 'simple-condition)
-	    (values (simple-condition-format-control condition)
-		    (simple-condition-format-arguments condition))
-	    (values "~A"
-		    (list (with-output-to-string (s)
-			    (princ condition s)))))
-      (print-compiler-message
-       (format nil "caught ~S:~%  ~A" what format-string)
-       format-args)))
+    (print-compiler-message
+     (format nil "caught ~S:~%~~@<  ~~@;~~A~~:>" what)
+     (list (with-output-to-string (s) (princ condition s)))))
   (values))
 
 ;;; The act of signalling one of these beasts must not cause WARNINGSP
@@ -425,15 +418,9 @@ has written, having proved that it is unreachable."))
 	(muffle-warning ()
 	  (return-from compiler-notify (values))))
       (incf *compiler-note-count*)
-      (multiple-value-bind (format-string format-args)
-	  (if (typep condition 'simple-condition)
-	      (values (simple-condition-format-control condition)
-		      (simple-condition-format-arguments condition))
-	      (values "~A"
-		      (list (with-output-to-string (s)
-			      (princ condition s)))))
-	(print-compiler-message (format nil "note: ~A" format-string)
-				format-args))))
+      (print-compiler-message 
+       (format nil "note: ~~A")
+       (list (with-output-to-string (s) (princ condition s))))))
   (values))
 
 ;;; Issue a note when we might or might not be in the compiler.