diff options
| author | Juanma Barranquero | 2010-07-05 00:26:11 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-07-05 00:26:11 +0200 |
| commit | 9c8a2331d427aa8e7b2c7deeba04c76b56ce694c (patch) | |
| tree | d60ca1645ee6adc3b92d7ac2efe4407b77b64c62 /src | |
| parent | 9a39b306d91622792c0483f1f788f96a39f8bdb5 (diff) | |
| download | emacs-9c8a2331d427aa8e7b2c7deeba04c76b56ce694c.tar.gz emacs-9c8a2331d427aa8e7b2c7deeba04c76b56ce694c.zip | |
* fileio.c (read_non_regular, read_non_regular_quit): Rename arg.
Diffstat (limited to 'src')
| -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 7c7ee7aeaa0..27253207eba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | 2010-07-04 Tetsurou Okazaki <okazaki@be.to> (tiny change) | 1 | 2010-07-04 Tetsurou Okazaki <okazaki@be.to> (tiny change) |
| 2 | Stefan Monnier <monnier@iro.umontreal.ca> | 2 | Stefan Monnier <monnier@iro.umontreal.ca> |
| 3 | 3 | ||
| 4 | * lread.c (read1): Fix up last change to not mess up `c'. | 4 | * lread.c (read1): Fix up last change to not mess up `c'. |
| 5 | 5 | ||
| @@ -13,8 +13,8 @@ | |||
| 13 | 13 | ||
| 14 | * atimer.c (start_atimer): Use EMACS_TIME, not struct timeval. | 14 | * atimer.c (start_atimer): Use EMACS_TIME, not struct timeval. |
| 15 | * dired.c (file_name_completion_stat): Use DIRENTRY, not struct dirent. | 15 | * dired.c (file_name_completion_stat): Use DIRENTRY, not struct dirent. |
| 16 | * fileio.c (read_non_regular, read_non_regular_quit): Pass Lisp_Object, | 16 | * fileio.c (read_non_regular, read_non_regular_quit): Add Lisp_Object |
| 17 | as required by internal_condition_case_1. | 17 | arg, as required by internal_condition_case_1. |
| 18 | * print.c (strout): Use const char* for arg PTR. | 18 | * print.c (strout): Use const char* for arg PTR. |
| 19 | * regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object. | 19 | * regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object. |
| 20 | (analyse_first): Fix "const const". | 20 | (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; | |||
| 3253 | Value is the number of bytes read. */ | 3253 | Value is the number of bytes read. */ |
| 3254 | 3254 | ||
| 3255 | static Lisp_Object | 3255 | static Lisp_Object |
| 3256 | read_non_regular (Lisp_Object ignored) | 3256 | read_non_regular (Lisp_Object ignore) |
| 3257 | { | 3257 | { |
| 3258 | EMACS_INT nbytes; | 3258 | EMACS_INT nbytes; |
| 3259 | 3259 | ||
| @@ -3271,7 +3271,7 @@ read_non_regular (Lisp_Object ignored) | |||
| 3271 | in insert-file-contents. */ | 3271 | in insert-file-contents. */ |
| 3272 | 3272 | ||
| 3273 | static Lisp_Object | 3273 | static Lisp_Object |
| 3274 | read_non_regular_quit (Lisp_Object ignored) | 3274 | read_non_regular_quit (Lisp_Object ignore) |
| 3275 | { | 3275 | { |
| 3276 | return Qnil; | 3276 | return Qnil; |
| 3277 | } | 3277 | } |