From: Glenn Morris <rgm@gnu.org>
Date: Mon, 13 Jun 2016 17:14:35 +0000 (-0400)
Subject: * lisp/help-fns.el (describe-function-1): Avoid reporting advised
X-Git-Tag: emacs-25.1-rc1~90
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e881070;p=emacs.git

* lisp/help-fns.el (describe-function-1): Avoid reporting advised
autoloads as aliases.  (Bug#21299)
---

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 496deb5c4f1..26d8839f7cb 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -514,7 +514,8 @@ FILE is the file where FUNCTION was probably defined."
 		real-function))
 	 (aliased (or (symbolp def)
 		      ;; Advised & aliased function.
-		      (and advised (symbolp real-function))))
+		      (and advised (symbolp real-function)
+			   (not (eq 'autoload (car-safe def))))))
 	 (real-def (cond
 		    (aliased (let ((f real-function))
 			       (while (and (fboundp f)