From c0bd248ccb698c6b665a6fd1f50251b54285c98b Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Thu, 3 Jan 2013 22:42:11 -0500 Subject: [PATCH] * lisp/subr.el (internal--called-interactively-p--get-frame): Find aliases of called-interactively-p as well. Fixes: debbugs:13237 --- lisp/ChangeLog | 3 +++ lisp/subr.el | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6314c1218bb..cc1e652eb5d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-01-04 Stefan Monnier + * subr.el (internal--called-interactively-p--get-frame): Find aliases + of called-interactively-p as well (bug#13237). + * view.el (view--enable, view--disable): Rename from view-mode-enable and view-mode-disable and assume it's called from view-mode. (view-mode-enable, view-mode-disable): Redefine as obsolete diff --git a/lisp/subr.el b/lisp/subr.el index 7ca0169abdb..11e882d9158 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3977,8 +3977,8 @@ the number of frames to skip (minus 1).") `(progn (defvar ,sym (let ((i 1)) - (while (not (eq (nth 1 (backtrace-frame i)) - 'called-interactively-p)) + (while (not (eq (indirect-function (nth 1 (backtrace-frame i)) t) + (indirect-function 'called-interactively-p))) (setq i (1+ i))) i)) ;; (unless (eq (nth 1 (backtrace-frame ,sym)) 'called-interactively-p) -- 2.11.4.GIT