From: Andreas Schwab <schwab@linux-m68k.org>
Date: Tue, 3 Jul 2012 07:12:22 +0000 (+0200)
Subject: Fixes: debbugs:11848
X-Git-Tag: emacs-24.2.90~1199^2~249
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b9d8233998965b6d8206bfd0643d25377a1f018f;p=emacs.git

Fixes: debbugs:11848

* help-fns.el (describe-function-1): Only call
help-fns--autoloaded-p when we have a file name.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd136f5b053..6a9e648f1cc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-03  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* help-fns.el (describe-function-1): Only call
+	help-fns--autoloaded-p when we have a file name.  (Bug#11848)
+
 2012-07-03  Chong Yidong  <cyd@gnu.org>
 
 	* xml.el: Protect parser against XML bombs.
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 52f1fe26056..387b65fe243 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -444,6 +444,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
 		       (help-fns--autoloaded-p function file-name))
 		  (if (commandp def)
 		      "an interactive autoloaded "