From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 12 Jun 2022 03:50:35 +0000 (-0400)
Subject: * lisp/emacs-lisp/find-func.el (find-function-advised-original): Simplify
X-Git-Tag: emacs-29.0.90~1910^2~63
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4a3a73dd32bbb424cc3cbab31adc8a84d0b5916f;p=emacs.git

* lisp/emacs-lisp/find-func.el (find-function-advised-original): Simplify
---

diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 2dec51dd044..ac84b50b5fc 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -269,11 +269,7 @@ defined in C.")
 If FUNC is not a symbol, return it.  Else, if it's not advised,
 return the symbol's function definition."
   (or (and (symbolp func)
-           (featurep 'nadvice)
-           (let ((ofunc (symbol-function func)))
-             (if (advice--p ofunc)
-                 (advice--cd*r ofunc)
-               ofunc)))
+           (advice--cd*r (symbol-function func)))
       func))
 
 (defun find-function-C-source (fun-or-var file type)