From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 24 Feb 2024 22:52:14 +0000 (-0500)
Subject: * lisp/progmodes/elisp-mode.el (eval-last-sexp, eval-defun): Fix thinko
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4c9c6d6d1364c67947c0ea95a97510e4b4238fc7;p=emacs.git

* lisp/progmodes/elisp-mode.el (eval-last-sexp, eval-defun): Fix thinko

(cherry picked from commit 9a801f0b4621a46149ccf650ed1dc27942157562)
---

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 1ff4410c156..1da1a9cddd7 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -1629,7 +1629,8 @@ If `eval-expression-debug-on-error' is non-nil, which is the default,
 this command arranges for all errors to enter the debugger."
   (interactive "P")
   (values--store-value
-   (handler-bind ((error (if #'eval-expression--debug #'ignore)))
+   (handler-bind ((error (if eval-expression-debug-on-error
+                             #'eval-expression--debug #'ignore)))
      (elisp--eval-last-sexp eval-last-sexp-arg-internal))))
 
 (defun elisp--eval-defun-1 (form)
@@ -1768,7 +1769,8 @@ which see."
 	 (defvar edebug-all-defs)
 	 (eval-defun (not edebug-all-defs)))
 	(t
-	 (handler-bind ((error (if #'eval-expression--debug #'ignore)))
+	 (handler-bind ((error (if eval-expression-debug-on-error
+	                           #'eval-expression--debug #'ignore)))
 	   (elisp--eval-defun)))))
 
 ;;; ElDoc Support