From: Taylor R Campbell <campbell@mumble.net>
Date: Sun, 16 Nov 2014 20:24:42 +0000 (+0000)
Subject: Show the condition, not just its report, in derived condition reports.
X-Git-Tag: mit-scheme-pucked-9.2.12~376^2~109
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=d0f9b222818c786d3c067dedc0783a4f0e401a21;p=mit-scheme.git

Show the condition, not just its report, in derived condition reports.

That way you can (debug #@n) it or M-x browse-continuation it.
---

diff --git a/src/runtime/error.scm b/src/runtime/error.scm
index 433d37ca6..f43311987 100644
--- a/src/runtime/error.scm
+++ b/src/runtime/error.scm
@@ -964,7 +964,9 @@ USA.
 	  (lambda (condition port)
 	    (write-string "The port " port)
 	    (write (access-condition condition 'PORT) port)
-	    (write-string " signalled an error:" port)
+	    (write-string " signalled an error " port)
+	    (write (access-condition condition 'CONDITION) port)
+	    (write-string ":" port)
 	    (newline port)
 	    (write-condition-report (access-condition condition 'CONDITION)
 				    port))))
@@ -985,7 +987,9 @@ USA.
 	  (lambda (condition port)
 	    (write-string "The file " port)
 	    (write (access-condition condition 'FILENAME) port)
-	    (write-string " signalled an error:" port)
+	    (write-string " signalled an error " port)
+	    (write (access-condition condition 'CONDITION) port)
+	    (write-string ":" port)
 	    (newline port)
 	    (write-condition-report (access-condition condition 'CONDITION)
 				    port))))
@@ -1009,9 +1013,10 @@ USA.
 	    (write-string " signalled " port)
 	    (let ((condition (access-condition condition 'CONDITION)))
 	      (write-string (if (condition/error? condition)
-				"an error"
-				"a condition")
+				"an error "
+				"a condition ")
 			    port)
+	      (write condition port)
 	      (write-string ":" port)
 	      (newline port)
 	      (write-condition-report condition port)))))