0.7.4.22:

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

diff --git a/src/code/ntrace.lisp b/src/code/ntrace.lisp
index bca29e3..d666736 100644 (file)
--- a/src/code/ntrace.lisp
+++ b/src/code/ntrace.lisp
@@ -29,7 +29,7 @@
   "If the trace indentation exceeds this value, then indentation restarts at
    0.")
 
-(defvar *trace-encapsulate-default* :default
+(defvar *trace-encapsulate-default* t
   #+sb-doc
   "the default value for the :ENCAPSULATE option to TRACE")
 \f
@@ -183,7 +183,7 @@
     (dolist (entry *traced-entries*)
       (when (cdr entry) (incf depth)))
     (format t
-           "~@V,0T~W: "
+           "~V,0@T~W: "
            (+ (mod (* depth *trace-indentation-step*)
                    (- *max-trace-indentation* *trace-indentation-step*))
               *trace-indentation-step*)
@@ -248,7 +248,7 @@
                    (or (not wherein)
                        (trace-wherein-p frame wherein)))))
        (when conditionp
-        (let ((sb-kernel:*current-level* 0)
+        (let ((sb-kernel:*current-level-in-print* 0)
               (*standard-output* *trace-output*)
               (*in-trace* t))
           (fresh-line)
@@ -287,7 +287,7 @@
                 (or (cdr entry)
                     (let ((cond (trace-info-condition-after info)))
                       (and cond (funcall (cdr cond) frame)))))
-       (let ((sb-kernel:*current-level* 0)
+       (let ((sb-kernel:*current-level-in-print* 0)
              (*standard-output* *trace-output*)
              (*in-trace* t))
          (fresh-line)