* lisp/emacs-lisp/advice.el: Layer on top of nadvice.el.

Remove out of date self-require hack.
(ad-do-advised-functions): Use simple `dolist'.
(ad-advice-name, ad-advice-protected, ad-advice-enabled)
(ad-advice-definition): Redefine as functions.
(ad-advice-classes): Move before first use.
(ad-make-origname, ad-set-orig-definition, ad-clear-orig-definition)
(ad-make-mapped-call, ad-make-advised-docstring, ad-make-plain-docstring)
(ad--defalias-fset): Remove functions.
(ad-make-advicefunname, ad-clear-advicefunname-definition): New functions.
(ad-get-orig-definition): Rewrite.
(ad-make-advised-definition-docstring): Change base docstring.
(ad-real-orig-definition): Rewrite.
(ad-map-arglists): Change name of called function.
(ad--make-advised-docstring): Redirect `function' from ad-Advice-...
(ad-make-advised-definition): Simplify.
(ad-assemble-advised-definition): Tweak for new calling context.
(ad-activate-advised-definition): Setup ad-Advice-* instead of ad-Orig-*.
(ad--defalias-fset): Rename from ad-handle-definition.  Make it set the
function and call ad-activate if needed.
(ad-activate, ad-deactivate): Don't call ad-handle-definition any more.
(ad-recover): Clear ad-Advice-* instead of ad-Orig-*.
(ad-compile-function): Compile ad-Advice-*.
(ad-activate-on-top-level, ad-with-auto-activation-disabled): Remove.
(ad-start-advice, ad-stop-advice): Remove.

1 files changed, 23 insertions, 0 deletions

diff --git a/test/automated/advice-tests.el b/test/automated/advice-tests.el
index 9f9719fdcfc..8f9bf54114c 100644
--- a/test/automated/advice-tests.el
+++ b/test/automated/advice-tests.el
@@ -57,6 +57,29 @@
      (defmacro sm-test3 (x) `(call-test3 ,x))
      (macroexpand '(sm-test3 56)) (toto (call-test3 56)))
 
+    ((defadvice sm-test4 (around wrap-with-toto activate)
+       ad-do-it (setq ad-return-value `(toto ,ad-return-value)))
+     (defmacro sm-test4 (x) `(call-test4 ,x))
+     (macroexpand '(sm-test4 56)) (toto (call-test4 56)))
+    ((defmacro sm-test4 (x) `(call-testq ,x))
+     (macroexpand '(sm-test4 56)) (toto (call-testq 56)))
+
+    ;; Combining old style and new style advices.
+    ((defun sm-test5 (x) (+ x 4))
+     (sm-test5 6) 10)
+    ((advice-add 'sm-test5 :around (lambda (f y) (* (funcall f y) 5)))
+     (sm-test5 6) 50)
+    ((defadvice sm-test5 (around test activate)
+       ad-do-it (setq ad-return-value (+ ad-return-value 0.1)))
+     (sm-test5 5) 45.1)
+    ((ad-deactivate 'sm-test5)
+     (sm-test5 6) 50)
+    ((ad-activate 'sm-test5)
+     (sm-test5 6) 50.1)
+    ((defun sm-test5 (x) (+ x 14))
+     (sm-test5 6) 100.1)
+    ((advice-remove 'sm-test5 (lambda (f y) (* (funcall f y) 5)))
+     (sm-test5 6) 20.1)
     ))
 
 (ert-deftest advice-tests ()