Commit 9c8a2331 authored by Juanma Barranquero's avatar Juanma Barranquero

* fileio.c (read_non_regular, read_non_regular_quit): Rename arg.

parent 9a39b306
2010-07-04 Tetsurou Okazaki <okazaki@be.to> (tiny change) 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'. * lread.c (read1): Fix up last change to not mess up `c'.
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
* atimer.c (start_atimer): Use EMACS_TIME, not struct timeval. * atimer.c (start_atimer): Use EMACS_TIME, not struct timeval.
* dired.c (file_name_completion_stat): Use DIRENTRY, not struct dirent. * dired.c (file_name_completion_stat): Use DIRENTRY, not struct dirent.
* fileio.c (read_non_regular, read_non_regular_quit): Pass Lisp_Object, * fileio.c (read_non_regular, read_non_regular_quit): Add Lisp_Object
as required by internal_condition_case_1. arg, as required by internal_condition_case_1.
* print.c (strout): Use const char* for arg PTR. * print.c (strout): Use const char* for arg PTR.
* regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object. * regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object.
(analyse_first): Fix "const const". (analyse_first): Fix "const const".
......
...@@ -3253,7 +3253,7 @@ static EMACS_INT non_regular_nbytes; ...@@ -3253,7 +3253,7 @@ static EMACS_INT non_regular_nbytes;
Value is the number of bytes read. */ Value is the number of bytes read. */
static Lisp_Object static Lisp_Object
read_non_regular (Lisp_Object ignored) read_non_regular (Lisp_Object ignore)
{ {
EMACS_INT nbytes; EMACS_INT nbytes;
...@@ -3271,7 +3271,7 @@ read_non_regular (Lisp_Object ignored) ...@@ -3271,7 +3271,7 @@ read_non_regular (Lisp_Object ignored)
in insert-file-contents. */ in insert-file-contents. */
static Lisp_Object static Lisp_Object
read_non_regular_quit (Lisp_Object ignored) read_non_regular_quit (Lisp_Object ignore)
{ {
return Qnil; return Qnil;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment