* lisp/emacs-lisp/debug.el (debug): Fix hard-coded frame counts.

Virtually backported from trunk.

Fixes: debbugs:10025

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17d339c4d78aa630905f7fd266580edb57e1868a..0c6093f5a9e940cb2b7c258256297fb2591e80bf 100644 (file)
--- 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 6be30fc916421cea8367fc89b4eb7081c31913b7..579b223fcacb160d3bc90f3ac92766450ed1e4f5 100644 (file)
--- 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