Mercurial > emacs
changeset 37304:9ca19dfc32fb
(ad-make-advised-definition): Construct
advice for subrs differently.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Tue, 10 Apr 2001 15:17:09 +0000 |
| parents | 3a9c22d4a66f |
| children | 8381b1ef7f3a |
| files | lisp/emacs-lisp/advice.el |
| diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emacs-lisp/advice.el Tue Apr 10 14:55:03 2001 +0000 +++ b/lisp/emacs-lisp/advice.el Tue Apr 10 15:17:09 2001 +0000 @@ -3089,20 +3089,20 @@ ;; expansion time and return the result. The moral of that ;; is that one should always deactivate advised special ;; forms before one byte-compiles a file. - (` ((, (if orig-macro-p - 'macroexpand - 'eval)) - (cons '(, origname) - (, (ad-get-arguments advised-arglist 0)))))) + `(,(if orig-macro-p 'macroexpand 'eval) + (cons ',origname + ,(ad-get-arguments advised-arglist 0)))) ((and orig-subr-p orig-interactive-p + (not interactive-form) (not advised-interactive-form)) ;; Check whether we were called interactively ;; in order to do proper prompting: - (` (if (interactive-p) - (call-interactively '(, origname)) - (, (ad-make-mapped-call - orig-arglist advised-arglist origname))))) + `(if (interactive-p) + (call-interactively ',origname) + ,(ad-make-mapped-call orig-arglist + advised-arglist + origname))) ;; And now for normal functions and non-interactive subrs ;; (or subrs whose interactive behavior was advised): (t (ad-make-mapped-call