From 6cdf6f788bd76ead3fd60899d101c718fdeb1b4e Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Wed, 7 Apr 2010 13:15:13 +0000 Subject: [PATCH] 1.0.37.48: nicer *PRINT-ESCAPE* printout for SIMPLE-CONDITIONs ...which is to say print the format control string to make them more identifiable form the escaped output. --- src/code/condition.lisp | 5 ++++- version.lisp-expr | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/code/condition.lisp b/src/code/condition.lisp index f9909cb..14a50ce 100644 --- a/src/code/condition.lisp +++ b/src/code/condition.lisp @@ -171,7 +171,10 @@ ;;; The current code doesn't seem to quite match that. (def!method print-object ((x condition) stream) (if *print-escape* - (print-unreadable-object (x stream :type t :identity t)) + (if (typep x 'simple-condition) + (print-unreadable-object (x stream :type t :identity t) + (format stream "~S" (simple-condition-format-control x))) + (print-unreadable-object (x stream :type t :identity t))) ;; KLUDGE: A comment from CMU CL here said ;; 7/13/98 BUG? CPL is not sorted and results here depend on order of ;; superclasses in define-condition call! diff --git a/version.lisp-expr b/version.lisp-expr index 56a62a3..fed5edb 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.37.47" +"1.0.37.48" -- 1.7.10.4