From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 2 May 2022 11:59:11 +0000 (+0200)
Subject: Make the eval-in-debug error message prettier in non-recursive errors
X-Git-Tag: emacs-29.0.90~1931^2~128
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bcdcaf0219906862d02f1e6ab83972c8f4d3c0ba;p=emacs.git

Make the eval-in-debug error message prettier in non-recursive errors

* lisp/emacs-lisp/debug.el (debugger-eval-expression): Make the
error message (when recursive debugging is off) prettier.
---

diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 91e9b0716d0..6c172d6c31d 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -539,17 +539,23 @@ The environment used is the one when entering the activation frame at point."
                       (error 0)))) ;; If on first line.
 	(base (debugger--backtrace-base)))
     (debugger-env-macro
-      (let ((val (if debug-allow-recursive-debug
-                     (backtrace-eval exp nframe base)
-                   (condition-case err
-                       (backtrace-eval exp nframe base)
-                     (error (format "%s: %s"
-                                    (get (car err) 'error-message)
-			            (car (cdr err))))))))
-        (prog1
-            (debugger--print val t)
-          (let ((str (eval-expression-print-format val)))
-            (if str (princ str t))))))))
+      (let* ((errored nil)
+             (val (if debug-allow-recursive-debug
+                      (backtrace-eval exp nframe base)
+                    (condition-case err
+                        (backtrace-eval exp nframe base)
+                      (error (setq errored
+                                   (format "%s: %s"
+                                           (get (car err) 'error-message)
+			                   (car (cdr err)))))))))
+        (if errored
+            (progn
+              (message "Error: %s" errored)
+              nil)
+          (prog1
+              (debugger--print val t)
+            (let ((str (eval-expression-print-format val)))
+              (if str (princ str t)))))))))
 
 (define-obsolete-function-alias 'debugger-toggle-locals
   'backtrace-toggle-locals "28.1")