From: Mattias Engdegård <mattiase@acm.org>
Date: Mon, 31 Jul 2023 14:14:07 +0000 (+0200)
Subject: ; Fix backport of help-fns--analyze-function bug fix
X-Git-Tag: emacs-29.1.90~272
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3560dfdb868556fb3f9ab3a5a1e5405f14c548c6;p=emacs.git

; Fix backport of help-fns--analyze-function bug fix

* lisp/help-fns.el (help-fns--analyze-function):
Add back the NOERROR argument to function-alias-p, needed because
Emacs 29 doesn't prevent the creation of circular function aliases.
This fixes a failure in help-fns-tests.
---

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index eb50f3b26ca..044bcf8b51f 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -995,7 +995,7 @@ Returns a list of the form (REAL-FUNCTION DEF ALIASED REAL-DEF)."
                                               (symbol-name function)))))))
 	 (real-def (cond
                     ((and aliased (not (subrp def)))
-                     (or (car (function-alias-p real-function))
+                     (or (car (function-alias-p real-function t))
                          real-function))
 		    ((subrp def) (intern (subr-name def)))
                     (t def))))