[Emacs-diffs] trunk r116590: * src/doc.c (Fsnarf_documentation): Snarf not-yet-bound variables

[Glenn Morris]

------------------------------------------------------------
revno: 116590
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/11565
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2014-02-27 21:00:17 -0500
message:
  * src/doc.c (Fsnarf_documentation): Snarf not-yet-bound variables
  from custom-delayed-init-variables.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/doc.c                      doc.c-20091113204419-o5vbwnq5f7feedwu-250

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-27 19:22:10 +0000
+++ b/src/ChangeLog     2014-02-28 02:00:17 +0000
@@ -1,3 +1,8 @@
+2014-02-28  Glenn Morris  <address@hidden>
+
+       * doc.c (Fsnarf_documentation): Snarf not-yet-bound variables
+       from custom-delayed-init-variables.  (Bug#11565)
+
 2014-02-27  Martin Rudalics  <address@hidden>
 
        More fixes for mouse glyph calculations (Bug#16647).

=== modified file 'src/doc.c'
--- a/src/doc.c 2014-01-03 05:37:58 +0000
+++ b/src/doc.c 2014-02-28 02:00:17 +0000
@@ -1,7 +1,6 @@
 /* Record indices of function doc strings stored in a file.
 
-Copyright (C) 1985-1986, 1993-1995, 1997-2014 Free Software Foundation,
-Inc.
+Copyright (C) 1985-1986, 1993-1995, 1997-2014 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -559,6 +558,12 @@
   char *p, *name;
   bool skip_file = 0;
   ptrdiff_t count;
+  /* Preloaded defcustoms using custom-initialize-delay are added to
+     this list, but kept unbound.  See http://debbugs.gnu.org/11565  */
+  Lisp_Object delayed_init =
+    find_symbol_value (intern ("custom-delayed-init-variables"));
+
+  if (EQ (delayed_init, Qunbound)) delayed_init = Qnil;
 
   CHECK_STRING (filename);
 
@@ -656,7 +661,8 @@
                  /* Install file-position as variable-documentation property
                     and make it negative for a user-variable
                     (doc starts with a `*').  */
-                  if (!NILP (Fboundp (sym)))
+                  if (!NILP (Fboundp (sym))
+                      || !NILP (Fmemq (sym, delayed_init)))
                     Fput (sym, Qvariable_documentation,
                           make_number ((pos + end + 1 - buf)
                                        * (end[1] == '*' ? -1 : 1)));