Merge from trunk.

3 files changed, 19 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 7027e9e5a95..5abf92bc4e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -11,6 +11,14 @@
         the Emacs and Gnulib regex code is merged.
         (xmalloc, xrealloc): Now static.
 
+2012-04-09  Glenn Morris  <rgm@gnu.org>
+
+        * doc.c (Fsnarf_documentation): Check variables, functions are bound,
+        not just in the obarray, before snarfing them.  (Bug#11036)
+
+        * Makefile.in ($(leimdir)/leim-list.el):
+        Pass EMACS rather than BUILT_EMACS.
+
 2012-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * process.c (make_process):
diff --git a/src/Makefile.in b/src/Makefile.in
index 19f586396cb..9525996caea 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -396,7 +396,7 @@ LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
 all: emacs$(EXEEXT) $(OTHER_FILES)
 
 $(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
-        cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el BUILT_EMACS=$(bootstrap_exe)
+        cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe)
 
 ## Does anyone ever pay attention to the load-path-shadows output here?
 ## The dumped Emacs is as functional and more efficient than
diff --git a/src/doc.c b/src/doc.c
index 02db4dde072..9e48a4d49f3 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -1,6 +1,6 @@
 /* Record indices of function doc strings stored in a file.
-   Copyright (C) 1985-1986, 1993-1995, 1997-2012
-                 Free Software Foundation, Inc.
+
+Copyright (C) 1985-1986, 1993-1995, 1997-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -671,15 +671,18 @@ the same file name is found in the `doc-directory'.  */)
                   /* Install file-position as variable-documentation property
                      and make it negative for a user-variable
                      (doc starts with a `*').  */
-                  Fput (sym, Qvariable_documentation,
-                        make_number ((pos + end + 1 - buf)
-                                     * (end[1] == '*' ? -1 : 1)));
+                  if (!NILP (Fboundp (sym)))
+                    Fput (sym, Qvariable_documentation,
+                          make_number ((pos + end + 1 - buf)
+                                       * (end[1] == '*' ? -1 : 1)));
                 }
 
               /* Attach a docstring to a function?  */
               else if (p[1] == 'F')
-                store_function_docstring (sym, pos + end + 1 - buf);
-
+                {
+                  if (!NILP (Ffboundp (sym)))
+                    store_function_docstring (sym, pos + end + 1 - buf);
+                }
               else if (p[1] == 'S')
                 ; /* Just a source file name boundary marker.  Ignore it.  */