Merge from mainline.

1 files changed, 20 insertions, 0 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 3f4e4b1b9ff..0f93941151e 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,23 @@
+2011-02-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * make-docfile.c (EMACS_INTEGER): Rename from EMACS_INT.
+        This avoids collision with config.h's EMACS_INT on some
+        configurations.  All uses changed.
+
+2011-02-08  Tom Tromey  <tromey@redhat.com>
+
+        * make-docfile.c: Unconditionally include stdlib.h.
+        (generate_globals): New global.
+        (xrealloc): New function.
+        (main): Handle '-g'.  Call start_globals, write_globals.
+        (scan_file): Conditionally call put_filename.
+        (start_globals): New function.
+        (struct global): New.
+        (num_globals, globals): New globals.
+        (add_global, compare_globals, write_globals): New functions.
+        (scan_c_file): Update for "-g".
+        (scan_lisp_file): Fail if "-g".
+
 2011-02-05  Paul Eggert  <eggert@cs.ucla.edu>
 
         * emacsclient.c: conform to C89 pointer rules