summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2005-10-24 16:14:34 +0000
committerStefan Monnier <monnier@iro.umontreal.ca>2005-10-24 16:14:34 +0000
commit18880c272f3f1c2ebccae5319c7a53e95c8e6567 (patch)
tree7141279b55f8ae279dfeb3f62009cc59c0410328 /lisp/emacs-lisp
parent38729cfb2ab9de5e65cb9d705ac3148edc46da42 (diff)
downloademacs-18880c272f3f1c2ebccae5319c7a53e95c8e6567.tar.gz
emacs-18880c272f3f1c2ebccae5319c7a53e95c8e6567.tar.bz2
emacs-18880c272f3f1c2ebccae5319c7a53e95c8e6567.zip
(ad-make-advised-definition): Fix arg-order.
(defadvice): Add `doc-string' declaration.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/advice.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index ce727c30d14..dc285a717af 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -3109,8 +3109,8 @@ in any of these classes."
;; in order to do proper prompting:
`(if (called-interactively-p)
(call-interactively ',origname)
- ,(ad-make-mapped-call orig-arglist
- advised-arglist
+ ,(ad-make-mapped-call advised-arglist
+ orig-arglist
origname)))
;; And now for normal functions and non-interactive subrs
;; (or subrs whose interactive behavior was advised):
@@ -3812,6 +3812,7 @@ documentation of the advised function can be dumped onto the `DOC' file
during preloading.
See Info node `(elisp)Advising Functions' for comprehensive documentation."
+ (declare (doc-string 3))
(if (not (ad-name-p function))
(error "defadvice: Invalid function name: %s" function))
(let* ((class (car args))
@@ -3986,5 +3987,5 @@ Use only in REAL emergencies."
(provide 'advice)
-;;; arch-tag: 29f8c9a1-8c88-471f-95d7-e28541c6b7c0
+;; arch-tag: 29f8c9a1-8c88-471f-95d7-e28541c6b7c0
;;; advice.el ends here