[Emacs-diffs] /srv/bzr/emacs/trunk r108838: Fixes: debbugs:11848

[Andreas Schwab]

------------------------------------------------------------
revno: 108838
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Tue 2012-07-03 09:12:22 +0200
message:
  Fixes: debbugs:11848
  
  * help-fns.el (describe-function-1): Only call
  help-fns--autoloaded-p when we have a file name.
modified:
  lisp/ChangeLog
  lisp/help-fns.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-07-03 05:28:42 +0000
+++ b/lisp/ChangeLog    2012-07-03 07:12:22 +0000
@@ -1,3 +1,8 @@
+2012-07-03  Andreas Schwab  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xml.el: Protect parser against XML bombs.

=== modified file 'lisp/help-fns.el'
--- a/lisp/help-fns.el  2012-06-27 05:47:14 +0000
+++ b/lisp/help-fns.el  2012-07-03 07:12:22 +0000
@@ -444,6 +444,7 @@
         (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 "