[Emacs-diffs] /srv/bzr/emacs/trunk r111418: * lisp/subr.el (internal--called-interactively-p--get-frame): Find aliases

[Stefan Monnier]

------------------------------------------------------------
revno: 111418
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13237
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2013-01-03 22:42:11 -0500
message:
  * lisp/subr.el (internal--called-interactively-p--get-frame): Find aliases
  of called-interactively-p as well.
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-04 02:53:48 +0000
+++ b/lisp/ChangeLog    2013-01-04 03:42:11 +0000
@@ -1,5 +1,8 @@
 2013-01-04  Stefan Monnier  <address@hidden>
 
+       * 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

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2013-01-03 02:37:57 +0000
+++ b/lisp/subr.el      2013-01-04 03:42:11 +0000
@@ -3977,8 +3977,8 @@
     `(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)