summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-08-08 19:14:20 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-08-08 19:14:20 -0400
commit0ca3f70e4f83a1cbfaa4356865f1eec180419786 (patch)
treecc88e3cb69a578a93de5b4c65a299a2b21817d64 /lisp/emacs-lisp
parent74c5d24c74e3167db6e3ee01831584c99905bb70 (diff)
downloademacs-0ca3f70e4f83a1cbfaa4356865f1eec180419786.tar.gz
emacs-0ca3f70e4f83a1cbfaa4356865f1eec180419786.tar.bz2
emacs-0ca3f70e4f83a1cbfaa4356865f1eec180419786.zip
* lisp/emacs-lisp/edebug.el (edebug-debugger): Use edebug-eval to run the
break-condition in the context of the debugged code. Fixes: debbugs:12685
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/edebug.el6
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 928d49f85ba..ec343eab631 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -2314,8 +2314,7 @@ MSG is printed after `::::} '."
(if edebug-global-break-condition
(condition-case nil
(setq edebug-global-break-result
- ;; FIXME: lexbind.
- (eval edebug-global-break-condition))
+ (edebug-eval edebug-global-break-condition))
(error nil))))
(edebug-break))
@@ -2326,8 +2325,7 @@ MSG is printed after `::::} '."
(and edebug-break-data
(or (not edebug-break-condition)
(setq edebug-break-result
- ;; FIXME: lexbind.
- (eval edebug-break-condition))))))
+ (edebug-eval edebug-break-condition))))))
(if (and edebug-break
(nth 2 edebug-break-data)) ; is it temporary?
;; Delete the breakpoint.