X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fprint.lisp;h=04d85f4e31d0c9e25c20c5ab64082e8731febb27;hb=5bf4a6a677c80a71dfa31b5c9c374f986594392f;hp=5b1ae0502d22534b79b5d70bb9f22e859e5753ba;hpb=29a9ccc860532b32c566aec095f570e999a9c52c;p=sbcl.git

diff --git a/src/code/print.lisp b/src/code/print.lisp
index 5b1ae05..04d85f4 100644
--- a/src/code/print.lisp
+++ b/src/code/print.lisp
@@ -376,11 +376,6 @@
 
 ;;;; OUTPUT-OBJECT -- the main entry point
 
-;;; the current pretty printer. This should be either a function that
-;;; takes two arguments (the object and the stream) or NIL to indicate
-;;; that there is no pretty printer installed.
-(defvar *pretty-printer* nil)
-
 ;;; Objects whose print representation identifies them EQLly don't
 ;;; need to be checked for circularity.
 (defun uniquely-identified-by-print-p (x)
@@ -393,10 +388,7 @@
 (defun output-object (object stream)
   (labels ((print-it (stream)
 	     (if *print-pretty*
-		 (if *pretty-printer*
-		     (funcall *pretty-printer* object stream)
-		     (let ((*print-pretty* nil))
-		       (output-ugly-object object stream)))
+		 (sb!pretty:output-pretty-object object stream)
 		 (output-ugly-object object stream)))
 	   (check-it (stream)
              (multiple-value-bind (marker initiate)
@@ -470,7 +462,7 @@
 		      *print-object-is-disabled-p*))
 	    (print-object object stream))
 	   ((typep object 'structure-object)
-	    (default-structure-print object stream *current-level*))
+	    (default-structure-print object stream *current-level-in-print*))
 	   (t
 	    (write-string "#<INSTANCE but not STRUCTURE-OBJECT>" stream))))
     (function
@@ -1054,7 +1046,7 @@
 ;;; use until CLOS is set up (at which time it will be replaced with
 ;;; the real generic function implementation)
 (defun print-object (instance stream)
-  (default-structure-print instance stream *current-level*))
+  (default-structure-print instance stream *current-level-in-print*))
 
 ;;;; integer, ratio, and complex printing (i.e. everything but floats)