From: Michael Heerdegen <michael_heerdegen@web.de>
Date: Fri, 7 Dec 2012 04:31:24 +0000 (-0500)
Subject: * lisp/emacs-lisp/debug.el (debug): Fix hard-coded frame counts.
X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/610251116cbe83cf8c56811f8e447a9b041ef24d

* 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 17d339c4d7..0c6093f5a9 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 6be30fc916..579b223fca 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