Merge from mainline.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 80baa5d131a..8d4ce09e4f7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-05-05  Paul Eggert  <eggert@cs.ucla.edu>
+2011-05-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         * image.c (Finit_image_library) [!HAVE_NTGUI]: Omit unused local.
 
@@ -113,6 +113,16 @@
 
         * fns.c (Frandom): Let EMACS_UINT be wider than unsigned long.
 
+2011-05-06  Juanma Barranquero  <lekktu@gmail.com>
+
+        * gnutls.c (DEF_GNUTLS_FN):
+        * image.c (DEF_IMGLIB_FN): Make function pointers static.
+
+2011-05-05  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * lread.c (lisp_file_lexically_bound_p): Stop scanning at end
+        marker.  (Bug#8610)
+
 2011-05-05 Eli Zaretskii  <eliz@gnu.org>
 
         * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]: