X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fpprint.lisp;h=74c368c966d3882d8062c4940ef31bcc54d73a65;hb=007bcd5aac2f3a1e714563bd39f7a2db2d0bf7c2;hp=5f9e6a4e8d06ca17fbeca3e2da17040b76af862a;hpb=b841c32badc4627f390cc8ab71b17bc158e7c6b1;p=sbcl.git

diff --git a/src/code/pprint.lisp b/src/code/pprint.lisp
index 5f9e6a4..74c368c 100644
--- a/src/code/pprint.lisp
+++ b/src/code/pprint.lisp
@@ -1241,7 +1241,7 @@ line break."
 (defun pprint-defpackage (stream list &rest noise)
   (declare (ignore noise))
   (funcall  (formatter
-             "~:<~W~^ ~3I~:_~W~^~1I~@{~:@_~:<~W~^ ~:I~@_~@{~W~^ ~_~}~:>~}~:>")
+             "~:<~W~^ ~3I~:_~W~^~1I~@{~:@_~:<~^~W~^ ~:I~@_~@{~W~^ ~_~}~:>~}~:>")
             stream
             list))
 
@@ -1315,8 +1315,13 @@ line break."
 ;;; OUTPUT-PRETTY-OBJECT is called by OUTPUT-OBJECT when
 ;;; *PRINT-PRETTY* is true.
 (defun output-pretty-object (object stream)
-  (with-pretty-stream (stream)
-    (funcall (pprint-dispatch object) stream object)))
+  (multiple-value-bind (fun pretty) (pprint-dispatch object)
+    (if pretty
+        (with-pretty-stream (stream)
+          (funcall fun stream object))
+        ;; No point in consing up a pretty stream if we are not using pretty
+        ;; printing the object after all.
+        (output-ugly-object object stream))))
 
 (defun !pprint-cold-init ()
   (/show0 "entering !PPRINT-COLD-INIT")