0.8.8.15:

	hacked TRACE :PRINT code so that it does TERPRI as well as
		FRESH-LINE (which is perhaps less elegant than doing
		only one or the other, but seems to be more robust
		than the previous FRESH-LINE-only solution)
	fixed overlooked merge conflict in NEWS (pointed out by
		Neil Schemenauer)

diff --git a/NEWS b/NEWS
index 73010e3..044f4e9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2313,16 +2313,13 @@ changes in sbcl-0.8.8 relative to sbcl-0.8.7:
     ** OPEN and WITH-OPEN-STREAM allow opening streams with
        element-type larger than ([UN]SIGNED-BYTE 32).
 
-<<<<<<< NEWS
-changes in sbcl-0.8.9 relative to sbcl-0.8.8:
-  * *DEBUG-PRINT-LEVEL* and *DEBUG-PRINT-LENGTH* are now deprecated in 
-    favor of the new, more general SB-DEBUG:*DEBUG-PRINT-VARIABLE-ALIST*
-    mechanism. (This matters to you only if you rebind the printer control
-    variables and then find you want different bindings in the debugger
-    than in the ordinary execution of your program.)
-
-=======
 changes in sbcl-0.8.9 relative to sbcl-0.8.8:
+  * deprecation of old extension: *DEBUG-PRINT-LEVEL* and
+    *DEBUG-PRINT-LENGTH* are now deprecated in favor of the new, more
+    general SB-DEBUG:*DEBUG-PRINT-VARIABLE-ALIST* mechanism. (This
+    should matter to you only if you rebind the printer control
+    variables and then find you want different bindings in the 
+    debugger than in the ordinary execution of your program.)
   * The runtime build system has been tweaked to support building
     (on SPARC/SunOS) using a C compiler which invokes Sun's own
     assembler and linker.  (thanks to Nikodemus Siivola)
@@ -2344,7 +2341,6 @@ changes in sbcl-0.8.9 relative to sbcl-0.8.8:
     ** CONCATENATED-STREAM-STREAMS discards constituent streams which
        have been read to end-of-file.
 
->>>>>>> 1.484
 planned incompatible changes in 0.8.x:
   * (not done yet, but planned:) When the profiling interface settles
     down, it might impact TRACE. They both encapsulate functions, and

diff --git a/src/code/ntrace.lisp b/src/code/ntrace.lisp
index ac3e90d..588b30e 100644 (file)
--- a/src/code/ntrace.lisp
+++ b/src/code/ntrace.lisp
@@ -204,9 +204,10 @@
   (dolist (ele forms)
     (fresh-line)
     (print-trace-indentation)
-    (format t "~@<~S ~_= ~S~:>" (car ele) (funcall (cdr ele) frame))))
+    (format t "~@<~S ~_= ~S~:>" (car ele) (funcall (cdr ele) frame))
+    (terpri)))
 
-;;; Test a BREAK option, and break if true.
+;;; Test a BREAK option, and if true, break.
 (defun trace-maybe-break (info break where frame)
   (when (and break (funcall (cdr break) frame))
     (sb-di:flush-frames-above frame)

diff --git a/version.lisp-expr b/version.lisp-expr
index f8e8850..aab955f 100644 (file)
--- 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".)
-"0.8.8.14"
+"0.8.8.15"