# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1280107429 0
# Node ID 1f97e508ee4230df93a6b935489d17d7dfc23272
# Parent  3e5d1ad9094d3433da0481ccd3aa0e03d2ea9f51# Parent  6b02202d9fdc050cefb58c8cdf1124c5c12b0991
Merge from mainline.

diff -r 3e5d1ad9094d -r 1f97e508ee42 src/ChangeLog
--- a/src/ChangeLog	Sun Jul 25 23:02:59 2010 +0000
+++ b/src/ChangeLog	Mon Jul 26 01:23:49 2010 +0000
@@ -1,3 +1,7 @@
+2010-07-26  Juanma Barranquero  <lekktu@gmail.com>
+
+	* lread.c (unreadpure, mapatoms_1): Make static.
+
 2010-07-25  Juanma Barranquero  <lekktu@gmail.com>
 
 	* terminfo.c (tparam): Fix prototype of tparm.
diff -r 3e5d1ad9094d -r 1f97e508ee42 src/lread.c
--- a/src/lread.c	Sun Jul 25 23:02:59 2010 +0000
+++ b/src/lread.c	Mon Jul 26 01:23:49 2010 +0000
@@ -1276,7 +1276,6 @@
 
 static Lisp_Object
 load_unwind (Lisp_Object arg)  /* used as unwind-protect function in load */
-                     
 {
   FILE *stream = (FILE *) XSAVE_VALUE (arg)->pointer;
   if (stream != NULL)
@@ -1567,9 +1566,8 @@
 			   Vload_history);
 }
 
-Lisp_Object
+static Lisp_Object
 unreadpure (Lisp_Object junk) /* Used as unwind-protect function in readevalloop */
-                      
 {
   read_pure = 0;
   return Qnil;
@@ -3818,7 +3816,7 @@
     }
 }
 
-void
+static void
 mapatoms_1 (Lisp_Object sym, Lisp_Object function)
 {
   call1 (function, sym);