(ad-make-advised-definition): If the

original definition has an interactive form, but is Elp
instrumented, use the interactive form of the function called by
elp-wrapper.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a2c30391ee685de317c4a677c427db0b24fab09..178dfe8f56d2487448469d9673ec7914673024a0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2001-07-09  Gerd Moellmann  <gerd@gnu.org>
 
+       * emacs-lisp/advice.el (ad-make-advised-definition): If the
+       original definition has an interactive form, but is Elp
+       instrumented, use the interactive form of the function called by
+       elp-wrapper.
+
        * winner.el (winner-equal): Make it a defun.  Don't compare Winner
        configurations with compare-window-configuration; they aren't
        window configurations.

diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 268fea55b0c0a73041fcacd4345e3e0eac0ca1ee..c13bff9e7cc1d0e153c3afaf7dc0b36a8f957c4b 100644 (file)
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3068,11 +3068,15 @@ Example: `(ad-map-arglists '(a &rest args) '(w x y z))' will return
             (interactive-form
              (cond (orig-macro-p nil)
                    (advised-interactive-form)
-                   ((ad-interactive-form origdef))
+                   ((ad-interactive-form origdef)
+                    (if (and (symbolp function) (get function 'elp-info))
+                        (interactive-form (aref (get function 'elp-info) 2))
+                      (ad-interactive-form origdef)))                 
                    ;; Otherwise we must have a subr: make it interactive if
                    ;; we have to and initialize required arguments in case
                    ;; it is called interactively:
-                   (orig-interactive-p (interactive-form origdef))))
+                   (orig-interactive-p 
+                    (interactive-form origdef))))
             (orig-form
              (cond ((or orig-special-form-p orig-macro-p)
                     ;; Special forms and macros will be advised into macros.