* 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 d2f03c153019d8a6cf207d997cdc343e451c2cf0..9aecbd0f280737545656fd0b26dc9fc45f7a528d 100644 (file)
--- 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 8b149aad7bb8a8b9a9e19035a29dd9a1263a73b5..edcfc409085c7f4271fa70b869aec3ab3b9f02f5 100644 (file)
--- 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)