mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

* lisp/emacs-lisp/nadvice.el (advice--defalias-fset): Strip advices

Browse source 
This tries to make sure that (defalias F (symbol-function F)) stays a no-op.
This commit is contained in:
Stefan Monnier 2017-07-18 14:07:16 -04:00
parent 5ab91020fb
commit 24bd52565a
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/emacs-lisp/nadvice.el
View file

@ -385,6 +385,18 @@ of the piece of advice."
(defun advice--defalias-fset (fsetfun symbol newdef)
(unless fsetfun (setq fsetfun #'fset))
;; `newdef' shouldn't include advice wrappers, since that's what *we* manage!
;; So if `newdef' includes advice wrappers, it's usually because someone
;; naively took (symbol-function F) and then passed that back to `defalias':
;; let's strip them away.
(cond
((advice--p newdef) (setq newdef (advice--cd*r newdef)))
((and (eq 'macro (car-safe newdef))
(advice--p (cdr newdef)))
(setq newdef `(macro . ,(advice--cd*r (cdr newdef))))))
;; The saved-rewrite is specific to the current value, so since we are about
;; to overwrite that current value with new value, the old saved-rewrite is
;; not relevant any more.
(when (get symbol 'advice--saved-rewrite)
(put symbol 'advice--saved-rewrite nil))
(setq newdef (advice--normalize symbol newdef))