From 92ca51cc5e9d30818f5abf60a5a13f08f2ea7e96 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 12 Dec 2017 22:40:27 -0500 Subject: * lisp/subr.el (backtrace--print-frame): Use cl-prin1 * lisp/emacs-lisp/cl-print.el (cl-prin1): Catch errors, since callers generally don't expect errors. --- lisp/emacs-lisp/cl-print.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'lisp/emacs-lisp/cl-print.el') diff --git a/lisp/emacs-lisp/cl-print.el b/lisp/emacs-lisp/cl-print.el index 4fc178c29aa..5a26ecf05fe 100644 --- a/lisp/emacs-lisp/cl-print.el +++ b/lisp/emacs-lisp/cl-print.el @@ -269,12 +269,13 @@ Output is further controlled by the variables `cl-print-readably', `cl-print-compiled', along with output variables for the standard printing functions. See Info node `(elisp)Output Variables'." - (cond - (cl-print-readably (prin1 object stream)) - ((not print-circle) (cl-print-object object stream)) - (t - (let ((cl-print--number-table (cl-print--preprocess object))) - (cl-print-object object stream))))) + (if cl-print-readably + (prin1 object stream) + (with-demoted-errors "cl-prin1: %S" + (if (not print-circle) + (cl-print-object object stream) + (let ((cl-print--number-table (cl-print--preprocess object))) + (cl-print-object object stream)))))) ;;;###autoload (defun cl-prin1-to-string (object) -- cgit v1.2.3