diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-04-10 15:17:09 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-04-10 15:17:09 +0000 |
| commit | 8541c92408c12c49dfa5c649dc6b9ddced0fc906 (patch) | |
| tree | 6046d3dbfa2eb9a0cb442cde5a6fe0de6fa4d125 /lisp/emacs-lisp/advice.el | |
| parent | 3fe35f35c02fd27ccfe458583bf3858a86143975 (diff) | |
| download | emacs-8541c92408c12c49dfa5c649dc6b9ddced0fc906.tar.gz emacs-8541c92408c12c49dfa5c649dc6b9ddced0fc906.tar.bz2 emacs-8541c92408c12c49dfa5c649dc6b9ddced0fc906.zip | |
(ad-make-advised-definition): Construct
advice for subrs differently.
Diffstat (limited to 'lisp/emacs-lisp/advice.el')
| -rw-r--r-- | lisp/emacs-lisp/advice.el | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index 0333c51df64..268fea55b0c 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -3089,20 +3089,20 @@ Example: `(ad-map-arglists '(a &rest args) '(w x y z))' will return ;; 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 |