* lisp/emacs-lisp/cl.el (dolist, dotimes, declare): Use advice-add to

override the default.
* lisp/emacs-lisp/cl-macs.el (cl-dolist, cl-dotimes): Rewrite without using
cl--dotimes/dolist.
* lisp/subr.el (dolist, dotimes, declare): Redefine them normally, even when
`cl' is loaded.

* lisp/emacs-lisp/nadvice.el (advice--normalize): New function, extracted
from add-advice.
(advice--strip-macro): New function.
(advice--defalias-fset): Use them to handle macros.
(advice-add): Use them.
(advice-member-p): Correctly handle macros.

1 files changed, 7 insertions, 0 deletions

diff --git a/test/automated/advice-tests.el b/test/automated/advice-tests.el
index cac10e9602f..9f9719fdcfc 100644
--- a/test/automated/advice-tests.el
+++ b/test/automated/advice-tests.el
@@ -50,6 +50,13 @@
     ((ad-activate 'sm-test2)
      (sm-test2 6) 20)
     ((null (get 'sm-test2 'defalias-fset-function)) t)
+
+    ((advice-add 'sm-test3 :around
+                 (lambda (f &rest args) `(toto ,(apply f args)))
+                 '((name . wrap-with-toto)))
+     (defmacro sm-test3 (x) `(call-test3 ,x))
+     (macroexpand '(sm-test3 56)) (toto (call-test3 56)))
+
     ))
 
 (ert-deftest advice-tests ()