From: Glenn Morris <rgm@gnu.org>
Date: Tue, 7 Jun 2016 20:44:48 +0000 (-0400)
Subject: * lisp/help-fns.el (describe-function-1): Avoid reporting advised
X-Git-Tag: emacs-26.0.90~1842^2~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ea5d990f6315917bbd9c7b94856c52137405dad;p=emacs.git

* lisp/help-fns.el (describe-function-1): Avoid reporting advised
aliases as the type of their targets.
---

diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 040152a2c9f..f5913928664 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -541,14 +541,14 @@ FILE is the file where FUNCTION was probably defined."
     ;; Print what kind of function-like object FUNCTION is.
     (princ (cond ((or (stringp def) (vectorp def))
 		  "a keyboard macro")
-		 ((subrp def)
-		  (if (eq 'unevalled (cdr (subr-arity def)))
-		      (concat beg "special form")
-		    (concat beg "built-in function")))
 		 ;; Aliases are Lisp functions, so we need to check
 		 ;; aliases before functions.
 		 (aliased
 		  (format-message "an alias for `%s'" real-def))
+		 ((subrp def)
+		  (if (eq 'unevalled (cdr (subr-arity def)))
+		      (concat beg "special form")
+		    (concat beg "built-in function")))
 		 ((autoloadp def)
 		  (format "%s autoloaded %s"
 			  (if (commandp def) "an interactive" "an")