summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2016-06-13 13:14:35 -0400
committerGlenn Morris <rgm@gnu.org>2016-06-13 13:14:35 -0400
commite881070890d2603570af9939a4619234379758e5 (patch)
tree2a2fc7e82c88bfc4e4b6b2f331789479f6acf36c /lisp
parentd308aa1eee4e5ff01f742e52eef5fb2cceec2c24 (diff)
downloademacs-e881070890d2603570af9939a4619234379758e5.tar.gz
emacs-e881070890d2603570af9939a4619234379758e5.tar.bz2
emacs-e881070890d2603570af9939a4619234379758e5.zip
* lisp/help-fns.el (describe-function-1): Avoid reporting advised
autoloads as aliases. (Bug#21299)
Diffstat (limited to 'lisp')
-rw-r--r--lisp/help-fns.el3
1 files changed, 2 insertions, 1 deletions
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)