From 50f290812618d79c29a5c540bb65ee6e52dc548d Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 24 Jun 2014 20:48:10 -0400 Subject: [PATCH] * lisp/help-fns.el (describe-function-1): Check file-name is a string before calling help-fns--autoloaded-p. Fixes: debbugs:17564 --- lisp/ChangeLog | 5 +++++ lisp/help-fns.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5981c50af77..f0fecd95e9f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-25 Stefan Monnier + + * help-fns.el (describe-function-1): Check file-name is a string before + calling help-fns--autoloaded-p (bug#17564). + 2014-06-24 Juri Linkov * desktop.el (desktop-auto-save-enable) diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 5b0739ed9ae..46b73701835 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -460,7 +460,7 @@ FILE is the file where FUNCTION was probably defined." (beg (if (and (or (byte-code-function-p def) (keymapp def) (memq (car-safe def) '(macro lambda closure))) - file-name + (stringp file-name) (help-fns--autoloaded-p function file-name)) (if (commandp def) "an interactive autoloaded " -- 2.39.5