Mercurial > emacs
changeset 109424:79cf9151e229
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 04 Jul 2010 23:34:54 +0000 |
| parents | ae5ef13849d8 (current diff) b2c0bf061382 (diff) |
| children | 773dc1704474 |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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".
--- 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; }