procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/emacs-lisp/edebug.el (edebug-debugger): Use edebug-eval to run the

Browse source 
break-condition in the context of the debugged code.

Fixes: debbugs:12685
This commit is contained in:
Stefan Monnier 2013-08-08 19:14:20 -04:00
parent 74c5d24c74
commit 0ca3f70e4f
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-08-08 Stefan Monnier <monnier@iro.umontreal.ca>
* emacs-lisp/edebug.el (edebug-debugger): Use edebug-eval to run the
break-condition in the context of the debugged code (bug#12685).
2013-08-08 Christopher Schmidt <christopher@ch.ristopher.com>
* comint.el:
@ -6,8 +11,8 @@
(comint-last-prompt): New variable.
(comint-last-prompt-overlay): Remove. Superseded by
comint-last-prompt.
(comint-snapshot-last-prompt, comint-output-filter): Use
comint-last-prompt.
(comint-snapshot-last-prompt, comint-output-filter):
Use comint-last-prompt.
2013-08-08 Juanma Barranquero <lekktu@gmail.com>
@ -164,8 +169,8 @@
2013-08-06 Dmitry Antipov <dmantipov@yandex.ru>
* files.el (cache-long-line-scans): Make
obsolete alias to `cache-long-scans'.
* files.el (cache-long-line-scans):
Make obsolete alias to `cache-long-scans'.
2013-08-06 Juanma Barranquero <lekktu@gmail.com>

6
lisp/emacs-lisp/edebug.el
View file

@ -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.