# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1278286494 0
# Node ID 79cf9151e229e830d8fb14346f52f4729836034b
# Parent  ae5ef13849d8c8bf73909de975b7a8a98702697e# Parent  b2c0bf0613825d190143547c7d833badfde895fa
Merge from mainline.

diff -r ae5ef13849d8 -r 79cf9151e229 src/ChangeLog
--- a/src/ChangeLog	Sun Jul 04 22:11:22 2010 +0000
+++ b/src/ChangeLog	Sun Jul 04 23:34:54 2010 +0000
@@ -1,5 +1,5 @@
 2010-07-04  Tetsurou Okazaki  <okazaki@be.to>  (tiny change)
-	        Stefan Monnier  <monnier@iro.umontreal.ca>
+            Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* lread.c (read1): Fix up last change to not mess up `c'.
 
@@ -13,8 +13,8 @@
 
 	* atimer.c (start_atimer): Use EMACS_TIME, not struct timeval.
 	* dired.c (file_name_completion_stat): Use DIRENTRY, not struct dirent.
-	* fileio.c (read_non_regular, read_non_regular_quit): Pass Lisp_Object,
-	as required by internal_condition_case_1.
+	* fileio.c (read_non_regular, read_non_regular_quit): Add Lisp_Object
+	arg, as required by internal_condition_case_1.
 	* print.c (strout): Use const char* for arg PTR.
 	* regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object.
 	(analyse_first): Fix "const const".
diff -r ae5ef13849d8 -r 79cf9151e229 src/fileio.c
--- a/src/fileio.c	Sun Jul 04 22:11:22 2010 +0000
+++ b/src/fileio.c	Sun Jul 04 23:34:54 2010 +0000
@@ -3253,7 +3253,7 @@
    Value is the number of bytes read.  */
 
 static Lisp_Object
-read_non_regular (Lisp_Object ignored)
+read_non_regular (Lisp_Object ignore)
 {
   EMACS_INT nbytes;
 
@@ -3271,7 +3271,7 @@
    in insert-file-contents.  */
 
 static Lisp_Object
-read_non_regular_quit (Lisp_Object ignored)
+read_non_regular_quit (Lisp_Object ignore)
 {
   return Qnil;
 }