diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2016-05-31 20:01:02 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2016-05-31 20:01:02 +0200 |
| commit | 6dbbd98abb7c3327013dba57c058a6372b6628af (patch) | |
| tree | 48ffd3a2de48c4fb2031a8082beac35c0f7f1f01 /lisp/emacs-lisp | |
| parent | 9878cf4d30589eed27ea609de3ebd9cb9c72d41f (diff) | |
| parent | 8e22067d59f59ee3a39f5d4f95c27e8ea3c935d6 (diff) | |
| download | emacs-6dbbd98abb7c3327013dba57c058a6372b6628af.tar.gz emacs-6dbbd98abb7c3327013dba57c058a6372b6628af.tar.bz2 emacs-6dbbd98abb7c3327013dba57c058a6372b6628af.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.el | 6 |
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). |