* lisp/subr.el (internal--called-interactively-p--get-frame): Find aliases

of called-interactively-p as well.

Fixes: debbugs:13237

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6314c1218bb44bc922f973de5ffd67f076240227..cc1e652eb5d3cea81f8dab2643088ad16ddaab6b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-01-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * 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 7ca0169abdbe716d6cbf8e8ac8b0c994f30e08a2..11e882d91588425c5a92d6bccf29a9359769f377 100644 (file)
--- 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)