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 433d37ca6019155c7921d909bceffa415e1ce5c6..f43311987f2f8c26897b95ee1627d4440bd3e14f 100644 (file)
--- 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)))))