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

[Stefan Monnier]

branch: master
commit 9a801f0b4621a46149ccf650ed1dc27942157562
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * lisp/progmodes/elisp-mode.el (eval-last-sexp, eval-defun): Fix thinko
---
 lisp/progmodes/elisp-mode.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 4b1f8022f81..8a713bd19a2 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -1630,7 +1630,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)
@@ -1769,7 +1770,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