* lisp/emacs-lisp/nadvice.el (advice--interactive-form): Don't get fooled

into autoloading just because of a silly indirection.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69227adfd79c0aeb5c43d00c180c32b0d2b9637d..3cfb50cafd094daf34619a41a63a044b1d81d9e5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * 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  <santiagopim@gmail.com>  (tiny change)
 
        * vc/vc-hg.el (vc-hg-unregister): New function.  (Bug#17454)

diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 332d1ed61b6cee1ea3fe1c7916a76c53905c2f8b..01027c43148bda8755e01587a0738b243f9d6912 100644 (file)
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -134,7 +134,7 @@ Each element has the form (WHERE BYTECODE STACK) where:
 (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)))))))