[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111004: * lisp/emacs-lisp/debug.el (debug): Fix hard-coded frame counts.

[Stefan Monnier]

------------------------------------------------------------
revno: 111004
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10025
author: Michael Heerdegen <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-12-06 23:31:24 -0500
message:
  * lisp/emacs-lisp/debug.el (debug): Fix hard-coded frame counts.
  Virtually backported from trunk.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/debug.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-07 03:55:40 +0000
+++ b/lisp/ChangeLog    2012-12-07 04:31:24 +0000
@@ -1,3 +1,8 @@
+2012-12-07  Michael Heerdegen  <address@hidden>
+
+       * emacs-lisp/debug.el (debug): Fix hard-coded frame counts (bug#10025).
+       Virtually backported from trunk.
+
 2012-12-07  Juanma Barranquero  <address@hidden>
 
        * vc/vc-hooks.el (vc-state): Doc fix.

=== modified file 'lisp/emacs-lisp/debug.el'
--- a/lisp/emacs-lisp/debug.el  2012-11-11 01:16:25 +0000
+++ b/lisp/emacs-lisp/debug.el  2012-12-07 04:31:24 +0000
@@ -220,10 +220,10 @@
              (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