Mercurial > emacs
changeset 109138:b2c0bf061382
* fileio.c (read_non_regular, read_non_regular_quit): Rename arg.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Mon, 05 Jul 2010 00:26:11 +0200 |
| parents | 14077aaa95b4 |
| children | c25c24812fb1 79cf9151e229 |
| files | src/ChangeLog src/fileio.c |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jul 04 23:49:48 2010 +0200 +++ b/src/ChangeLog Mon Jul 05 00:26:11 2010 +0200 @@ -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".
--- a/src/fileio.c Sun Jul 04 23:49:48 2010 +0200 +++ b/src/fileio.c Mon Jul 05 00:26:11 2010 +0200 @@ -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; }