From ad5a2bbde071138cacadd19b95f2638741fd5d8d Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Fri, 2 Oct 2020 22:17:09 +0200 Subject: [PATCH] Revert "Add `advice-flet' macro" This reverts commit d07d7ab1a0e321ced62ebe5dd9db27eb7e93430e. --- lisp/emacs-lisp/nadvice.el | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el index 21da038dc1c..5b3aa708508 100644 --- a/lisp/emacs-lisp/nadvice.el +++ b/lisp/emacs-lisp/nadvice.el @@ -356,32 +356,6 @@ of the piece of advice." (macroexp-let2 nil new `(advice--remove-function ,getter ,function) `(unless (eq ,new ,getter) ,(funcall setter new))))) -;;;###autoload -(defmacro advice-flet (bindings &rest body) - ;; FIXME add doc. - (declare (indent 1)) - (let ((let-binds ()) - (ad-add ()) - (ad-del ())) - (dolist (bind bindings) - (let* ((fun-name (car bind)) - (fun (cadr bind)) - (tmp-sym (gensym (symbol-name fun-name)))) - (push `(,tmp-sym ,fun) let-binds) - (push `(advice-add #',fun-name - ,(if (= (length bind) 3) - (nth 2 bind) - :override) - ,tmp-sym) - ad-add) - (push `(advice-remove #',fun-name ,tmp-sym) ad-del))) - `(let ,(reverse let-binds) - (unwind-protect - (progn - ,@(reverse ad-add) - ,@body) - ,@(reverse ad-del))))) - (defun advice-function-mapc (f function-def) "Apply F to every advice function in FUNCTION-DEF. F is called with two arguments: the function that was added, and the -- 2.39.5