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 dd136f5b053d813fe34b298ee25edc2b5e3a3c32..6a9e648f1cc45b9d8c962022bb4f87fd24ec7da6 100644 (file)
--- 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 52f1fe26056522852b3d3118df6065a4418947ec..387b65fe243c2745c03abfd2a0f89a524c5be68b 100644 (file)
--- 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 "