0.6.10:

[sbcl.git] / src / code / describe.lisp

diff --git a/src/code/describe.lisp b/src/code/describe.lisp
index d53dcc6..8a97208 100644 (file)
--- a/src/code/describe.lisp
+++ b/src/code/describe.lisp
@@ -83,7 +83,10 @@
        (when (and *print-length* (> n *print-length*))
          (format s "~:_...")
          (return))
-       (format s "~:_(~S ~S)" k v)))))
+       (format s "~:_(~@<~S ~:_~S~:>)" k v)))))
+
+(defmethod describe-object ((condition condition) s)
+  (sb-kernel:describe-condition condition s))
 \f
 ;;;; DESCRIBE-OBJECT methods for symbols and functions, including all
 ;;;; sorts of messy stuff about documentation, type information,
@@ -155,25 +158,23 @@
   (let ((info (sb-kernel:%code-debug-info code-obj)))
     (when info
       (let ((sources (sb-c::debug-info-source info)))
-       (format s "~@:_On ~A it was compiled from:"
-               ;; FIXME: The FORMAT-UNIVERSAL-TIME calls in the system
-               ;; should become more consistent, probably not using
-               ;; any nondefault options.
-               (format-universal-time nil
-                                      (sb-c::debug-source-compiled
-                                       (first sources))
-                                      :style :abbreviated))
-       (dolist (source sources)
-         (let ((name (sb-c::debug-source-name source)))
-           (ecase (sb-c::debug-source-from source)
-             (:file
-              (format s "~@:_~A~@:_  Created: " (namestring name))
-              (sb-int:format-universal-time t (sb-c::debug-source-created
-                                               source))
-              (let ((comment (sb-c::debug-source-comment source)))
-                (when comment
-                  (format s "~@:_  Comment: ~A" comment))))
-             (:lisp (format s "~@:_~S" name)))))))))
+       (when sources
+         (format s "~@:_On ~A it was compiled from:"
+                 ;; FIXME: The FORMAT-UNIVERSAL-TIME calls in the system
+                 ;; should become more consistent, probably not using
+                 ;; any nondefault options.
+                 (format-universal-time nil
+                                        (sb-c::debug-source-compiled
+                                         (first sources))
+                                        :style :abbreviated))
+         (dolist (source sources)
+           (let ((name (sb-c::debug-source-name source)))
+             (ecase (sb-c::debug-source-from source)
+               (:file
+                (format s "~@:_~A~@:_  Created: " (namestring name))
+                (sb-int:format-universal-time s (sb-c::debug-source-created
+                                                 source)))
+               (:lisp (format s "~@:_~S" name))))))))))
 
 ;;; Describe a compiled function. The closure case calls us to print
 ;;; the guts.