summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorK. Handa <handa@gnu.org>2016-06-01 09:16:32 +0900
committerK. Handa <handa@gnu.org>2016-06-01 09:16:32 +0900
commit8e22067d59f59ee3a39f5d4f95c27e8ea3c935d6 (patch)
tree98c0480e0765c4f2b3d24ff5a1617e64a9109d80 /lisp/emacs-lisp
parent6d66089127313a1c5b5c5584eaf3e9edec010955 (diff)
parent25cc0f2aada3e321e5f1c6d1e492a93d16da45b2 (diff)
downloademacs-8e22067d59f59ee3a39f5d4f95c27e8ea3c935d6.tar.gz
emacs-8e22067d59f59ee3a39f5d4f95c27e8ea3c935d6.tar.bz2
emacs-8e22067d59f59ee3a39f5d4f95c27e8ea3c935d6.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/find-func.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 71437ce89bd..4a7b7109106 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -404,8 +404,10 @@ signal an error.
If VERBOSE is non-nil, and FUNCTION is an alias, display a
message about the whole chain of aliases."
- (let ((def (if (symbolp function)
- (find-function-advised-original function)))
+ (let ((def (when (symbolp function)
+ (or (fboundp function)
+ (signal 'void-function (list function)))
+ (find-function-advised-original function)))
aliases)
;; FIXME for completeness, it might be nice to print something like:
;; foo (which is advised), which is an alias for bar (which is advised).