From: Juanma Barranquero Date: Sun, 4 Jul 2010 22:26:11 +0000 (+0200) Subject: * fileio.c (read_non_regular, read_non_regular_quit): Rename arg. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~51^2~81^2~33 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9c8a2331d427aa8e7b2c7deeba04c76b56ce694c;p=emacs.git * fileio.c (read_non_regular, read_non_regular_quit): Rename arg. --- diff --git a/src/ChangeLog b/src/ChangeLog index 7c7ee7aeaa0..27253207eba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,5 @@ 2010-07-04 Tetsurou Okazaki (tiny change) - Stefan Monnier + Stefan Monnier * 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 --git a/src/fileio.c b/src/fileio.c index 0f80d572794..c68aa45e13d 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -3253,7 +3253,7 @@ static EMACS_INT non_regular_nbytes; 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 @@ read_non_regular (Lisp_Object ignored) in insert-file-contents. */ static Lisp_Object -read_non_regular_quit (Lisp_Object ignored) +read_non_regular_quit (Lisp_Object ignore) { return Qnil; }