diff options
author | Juanma Barranquero <[email protected]> | 2010-07-05 00:26:11 +0200 |
---|---|---|
committer | Juanma Barranquero <[email protected]> | 2010-07-05 00:26:11 +0200 |
commit | 9c8a2331d427aa8e7b2c7deeba04c76b56ce694c (patch) | |
tree | d60ca1645ee6adc3b92d7ac2efe4407b77b64c62 | |
parent | 9a39b306d91622792c0483f1f788f96a39f8bdb5 (diff) |
* fileio.c (read_non_regular, read_non_regular_quit): Rename arg.
-rw-r--r-- | src/ChangeLog | 6 | ||||
-rw-r--r-- | src/fileio.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7c7ee7aeaa..27253207eb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,5 @@ 2010-07-04 Tetsurou Okazaki <[email protected]> (tiny change) - Stefan Monnier <[email protected]> + Stefan Monnier <[email protected]> * 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 0f80d57279..c68aa45e13 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; } |