X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fntrace.lisp;h=912fd2c34634ce8366990d9385bf5c0825266d47;hb=dacd3fc70cf2fc78677f9a8bbbb5c3b51883f1b7;hp=80160703466c91e6a011b88304f5ae62cb390d78;hpb=f42877dcb11f1db580c76c37ae86541b901ac281;p=sbcl.git

diff --git a/src/code/ntrace.lisp b/src/code/ntrace.lisp
index 8016070..912fd2c 100644
--- a/src/code/ntrace.lisp
+++ b/src/code/ntrace.lisp
@@ -220,7 +220,9 @@
   (dolist (ele forms)
     (fresh-line)
     (print-trace-indentation)
-    (format t "~@<~S ~_= ~S~:>" (car ele) (funcall (cdr ele) frame))
+    (format t "~@<~S ~_= ~:[; No values~;~:*~{~S~^, ~}~]~:>"
+            (car ele)
+            (multiple-value-list (funcall (cdr ele) frame)))
     (terpri)))
 
 ;;; Test a BREAK option, and if true, break.
@@ -450,7 +452,7 @@
             (trace-1 mf info)
             (when (typep mf 'sb-pcl::%method-function)
               (trace-1 (sb-pcl::%method-function-fast-function mf) info)))))
-      
+
       function-or-name)))
 
 ;;;; the TRACE macro
@@ -660,7 +662,7 @@ are evaluated in the null environment."
       ((not fun)
        ;; Someone has FMAKUNBOUND it.
        (let ((table *traced-funs*))
-         (with-locked-hash-table (table)
+         (with-locked-system-table (table)
            (maphash (lambda (fun info)
                       (when (equal function-or-name (trace-info-what info))
                         (remhash fun table)))