[Emacs-diffs] /srv/bzr/emacs/trunk r100720: * fileio.c (read_non_regular, read_non_regular_quit): Rename arg.

[Juanma Barranquero]

------------------------------------------------------------
revno: 100720
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Mon 2010-07-05 00:26:11 +0200
message:
  * fileio.c (read_non_regular, read_non_regular_quit): Rename arg.
modified:
  src/ChangeLog
  src/fileio.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-04 21:49:48 +0000
+++ b/src/ChangeLog     2010-07-04 22:26:11 +0000
@@ -1,5 +1,5 @@
 2010-07-04  Tetsurou Okazaki  <address@hidden>  (tiny change)
-               Stefan Monnier  <address@hidden>
+            Stefan Monnier  <address@hidden>
 
        * 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".

=== modified file 'src/fileio.c'
--- a/src/fileio.c      2010-07-04 11:51:28 +0000
+++ b/src/fileio.c      2010-07-04 22:26:11 +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;
 }