[Emacs-diffs] emacs-24 r117105: * lisp/emacs-lisp/nadvice.el (advice--interactive-form): Don't get fooled

[Stefan Monnier]

------------------------------------------------------------
revno: 117105
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-05-12 01:25:34 -0400
message:
  * lisp/emacs-lisp/nadvice.el (advice--interactive-form): Don't get fooled
  into autoloading just because of a silly indirection.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/nadvice.el     nadvice.el-20121015213644-851fdxs2vximj8nr-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-11 02:01:08 +0000
+++ b/lisp/ChangeLog    2014-05-12 05:25:34 +0000
@@ -1,3 +1,8 @@
+2014-05-12  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/nadvice.el (advice--interactive-form): Don't get fooled
+       into autoloading just because of a silly indirection.
+
 2014-05-11  Santiago Payà i Miralta  <address@hidden>  (tiny change)
 
        * vc/vc-hg.el (vc-hg-unregister): New function.  (Bug#17454)

=== modified file 'lisp/emacs-lisp/nadvice.el'
--- a/lisp/emacs-lisp/nadvice.el        2014-05-10 20:07:01 +0000
+++ b/lisp/emacs-lisp/nadvice.el        2014-05-12 05:25:34 +0000
@@ -134,7 +134,7 @@
 (defun advice--interactive-form (function)
   ;; Like `interactive-form' but tries to avoid autoloading functions.
   (when (commandp function)
-    (if (not (and (symbolp function) (autoloadp (symbol-function function))))
+    (if (not (and (symbolp function) (autoloadp (indirect-function function))))
         (interactive-form function)
       `(interactive (advice-eval-interactive-spec
                      (cadr (interactive-form ',function)))))))