* lisp/emacs-lisp/debug.el: Use cl-print more systematically

(debugger-return-value, debugger-eval-expression, debugger--insert-locals):
Use debugger--print.

diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 473ead12f5a86511de4f2c3b144118684e0737e3..192333252a1816eb0507f2cf1f8ebb4cd3b65bd5 100644 (file)
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -420,7 +420,7 @@ will be used, such as in a debug on exit from a frame."
                "from an error" "at function entrance")))
   (setq debugger-value val)
   (princ "Returning " t)
-  (prin1 debugger-value)
+  (debugger--print debugger-value)
   (save-excursion
     ;; Check to see if we've flagged some frame for debug-on-exit, in which
     ;; case we'll probably come back to the debugger soon.
@@ -535,7 +535,7 @@ The environment used is the one when entering the activation frame at point."
     (debugger-env-macro
       (let ((val (backtrace-eval exp nframe base)))
         (prog1
-            (prin1 val t)
+            (debugger--print val t)
           (let ((str (eval-expression-print-format val)))
             (if str (princ str t))))))))
 
@@ -557,7 +557,7 @@ The environment used is the one when entering the activation frame at point."
               (insert "\n    ")
               (prin1 symbol (current-buffer))
               (insert " = ")
-              (prin1 value (current-buffer))))))))
+              (debugger--print value (current-buffer))))))))
 
 (defun debugger--show-locals ()
   "For the frame at point, insert locals and add text properties."