[Emacs-diffs] emacs-24 r117294: * lisp/help-fns.el (describe-function-1): Check file-name is a string before

[Stefan Monnier]

------------------------------------------------------------
revno: 117294
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17564
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-06-24 20:48:10 -0400
message:
  * lisp/help-fns.el (describe-function-1): Check file-name is a string before
  calling help-fns--autoloaded-p.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/help-fns.el               helpfns.el-20091113204419-o5vbwnq5f7feedwu-2354

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-24 23:23:41 +0000
+++ b/lisp/ChangeLog    2014-06-25 00:48:10 +0000
@@ -1,3 +1,8 @@
+2014-06-25  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * desktop.el (desktop-auto-save-enable)

=== modified file 'lisp/help-fns.el'
--- a/lisp/help-fns.el  2014-05-05 21:33:07 +0000
+++ b/lisp/help-fns.el  2014-06-25 00:48:10 +0000
@@ -460,7 +460,7 @@
         (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 "