diff options
author | Xue Fuqiao <xfq.free@gmail.com> | 2013-07-30 08:29:09 +0800 |
---|---|---|
committer | Xue Fuqiao <xfq.free@gmail.com> | 2013-07-30 08:29:09 +0800 |
commit | d2067333246b676fcf98567d34eec79ed4648d5f (patch) | |
tree | ad6543d8e7f1db50226907f7278373eef544d252 /lisp/emacs-lisp/nadvice.el | |
parent | 7aa7fff0c8860b72a2c7cdc7d4d0845245754d43 (diff) | |
parent | 86b192c1479d167c13edb9cdaa026c231c8a0442 (diff) | |
download | emacs-d2067333246b676fcf98567d34eec79ed4648d5f.tar.gz emacs-d2067333246b676fcf98567d34eec79ed4648d5f.tar.bz2 emacs-d2067333246b676fcf98567d34eec79ed4648d5f.zip |
Merge from mainline.
Diffstat (limited to 'lisp/emacs-lisp/nadvice.el')
-rw-r--r-- | lisp/emacs-lisp/nadvice.el | 2 |
1 files changed, 1 insertions, 1 deletions
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) |