From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 26 Jul 2013 18:41:18 +0000 (-0400)
Subject: * lisp/emacs-lisp/nadvice.el (advice--called-interactively-skip): Use the new
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1698^2~28
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ced0d044656b5fa4a9cd2bcc2326908be432bcf;p=emacs.git

* lisp/emacs-lisp/nadvice.el (advice--called-interactively-skip): Use the new
`base' arg of backtrace-frame.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2f03c15301..9aecbd0f280 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* emacs-lisp/nadvice.el (advice--called-interactively-skip): Use the new
+	`base' arg of backtrace-frame.
+
 2013-07-26  Juanma Barranquero  <lekktu@gmail.com>
 
 	* desktop.el (desktop--select-frame):
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 8b149aad7bb..edcfc409085 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -425,7 +425,7 @@ of the piece of advice."
          (get-next-frame
           (lambda ()
             (setq frame1 frame2)
-            (setq frame2 (internal--called-interactively-p--get-frame i))
+            (setq frame2 (backtrace-frame i #'called-interactively-p))
             ;; (message "Advice Frame %d = %S" i frame2)
             (setq i (1+ i)))))
     (when (and (eq (nth 1 frame2) 'apply)