aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2016-06-07 16:44:48 -0400
committerGlenn Morris2016-06-07 16:44:48 -0400
commit8ea5d990f6315917bbd9c7b94856c52137405dad (patch)
treed34822fa7ba5b925ab6904e3b5e6879789b5d114
parentb7adc2f23787eb72015cd705b873e229db6a5049 (diff)
downloademacs-8ea5d990f6315917bbd9c7b94856c52137405dad.tar.gz
emacs-8ea5d990f6315917bbd9c7b94856c52137405dad.zip
* lisp/help-fns.el (describe-function-1): Avoid reporting advised
aliases as the type of their targets.
-rw-r--r--lisp/help-fns.el8
1 files changed, 4 insertions, 4 deletions
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."
541 ;; Print what kind of function-like object FUNCTION is. 541 ;; Print what kind of function-like object FUNCTION is.
542 (princ (cond ((or (stringp def) (vectorp def)) 542 (princ (cond ((or (stringp def) (vectorp def))
543 "a keyboard macro") 543 "a keyboard macro")
544 ((subrp def)
545 (if (eq 'unevalled (cdr (subr-arity def)))
546 (concat beg "special form")
547 (concat beg "built-in function")))
548 ;; Aliases are Lisp functions, so we need to check 544 ;; Aliases are Lisp functions, so we need to check
549 ;; aliases before functions. 545 ;; aliases before functions.
550 (aliased 546 (aliased
551 (format-message "an alias for `%s'" real-def)) 547 (format-message "an alias for `%s'" real-def))
548 ((subrp def)
549 (if (eq 'unevalled (cdr (subr-arity def)))
550 (concat beg "special form")
551 (concat beg "built-in function")))
552 ((autoloadp def) 552 ((autoloadp def)
553 (format "%s autoloaded %s" 553 (format "%s autoloaded %s"
554 (if (commandp def) "an interactive" "an") 554 (if (commandp def) "an interactive" "an")