Merge from mainline.

4 files changed, 18 insertions, 4 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]:
diff --git a/src/gnutls.c b/src/gnutls.c
index e25ae25f64c..540bfaac25c 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -64,7 +64,7 @@ static void gnutls_log_function2 (int, const char*, const char*);
 #ifdef WINDOWSNT
 
 /* Macro for defining functions that will be loaded from the GnuTLS DLL.  */
-#define DEF_GNUTLS_FN(rettype,func,args) rettype (FAR CDECL *fn_##func)args
+#define DEF_GNUTLS_FN(rettype,func,args) static rettype (FAR CDECL *fn_##func)args
 
 /* Macro for loading GnuTLS functions from the library.  */
 #define LOAD_GNUTLS_FN(lib,func) {                                      \
diff --git a/src/image.c b/src/image.c
index 4e0503ac1dc..747142635af 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1892,7 +1892,7 @@ mark_image_cache (struct image_cache *c)
 #ifdef HAVE_NTGUI
 
 /* Macro for defining functions that will be loaded from image DLLs.  */
-#define DEF_IMGLIB_FN(rettype,func,args) rettype (FAR CDECL *fn_##func)args
+#define DEF_IMGLIB_FN(rettype,func,args) static rettype (FAR CDECL *fn_##func)args
 
 /* Macro for loading those image functions from the library.  */
 #define LOAD_IMGLIB_FN(lib,func) {                                      \
diff --git a/src/lread.c b/src/lread.c
index 7686f966db2..a6da09cf330 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -829,7 +829,7 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
             ch = READCHAR;
 
           i = 0;
-          while (ch != ':' && ch != '\n' && ch != EOF)
+          while (ch != ':' && ch != '\n' && ch != EOF && in_file_vars)
             {
               if (i < sizeof var - 1)
                 var[i++] = ch;
@@ -837,6 +837,10 @@ lisp_file_lexically_bound_p (Lisp_Object readcharfun)
               ch = READCHAR;
             }
 
+          /* Stop scanning if no colon was found before end marker.  */
+          if (!in_file_vars)
+            break;
+
           while (i > 0 && (var[i - 1] == ' ' || var[i - 1] == '\t'))
             i--;
           var[i] = '\0';