From d0f9b222818c786d3c067dedc0783a4f0e401a21 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sun, 16 Nov 2014 20:24:42 +0000 Subject: [PATCH] Show the condition, not just its report, in derived condition reports. That way you can (debug #@n) it or M-x browse-continuation it. --- src/runtime/error.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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))))) -- 2.25.1