diff options
| author | Michael Heerdegen <michael_heerdegen@web.de> | 2012-12-06 23:31:24 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-12-06 23:31:24 -0500 |
| commit | f5cc2ad69c4ba60059d70241ad59b5299a93f3cd (patch) | |
| tree | ef8398a7f7fb1f105d4caebee8b1cbefe25508e8 | |
| parent | 55bbc607a91c34a83bf786081d1ac3c0cc6a066e (diff) | |
| download | emacs-f5cc2ad69c4ba60059d70241ad59b5299a93f3cd.tar.gz | |
* lisp/emacs-lisp/debug.el (debug): Fix hard-coded frame counts.
Virtually backported from trunk.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/debug.el | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a8ff70d0644..478a75248c8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-12-07 Michael Heerdegen <michael_heerdegen@web.de> + + * emacs-lisp/debug.el (debug): Fix hard-coded frame counts (bug#10025). + Virtually backported from trunk. + 2012-12-07 Juanma Barranquero <lekktu@gmail.com> * vc/vc-hooks.el (vc-state): Doc fix. diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el index 6be30fc9164..579b223fcac 100644 --- a/lisp/emacs-lisp/debug.el +++ b/lisp/emacs-lisp/debug.el @@ -220,10 +220,10 @@ first will be printed into the backtrace buffer." (when (eq (car debugger-args) 'debug) ;; Skip the frames for backtrace-debug, byte-code, ;; and implement-debug-on-entry. - (backtrace-debug 4 t) + (backtrace-debug 3 t) ;; Place an extra debug-on-exit for macro's. - (when (eq 'lambda (car-safe (cadr (backtrace-frame 4)))) - (backtrace-debug 5 t))) + (when (eq 'lambda (car-safe (cadr (backtrace-frame 3)))) + (backtrace-debug 4 t))) (pop-to-buffer debugger-buffer `((display-buffer-reuse-window |