Mercurial > emacs
comparison src/fileio.c @ 109129:907fcf8bd2ef
Fix prototypes.
* 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.
* regex.c (bcmp_translate): Use RE_TRANSLATE_TYPE, not Lisp_Object.
(analyse_first): Fix "const const".
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 04 Jul 2010 13:51:28 +0200 |
parents | aec1143e8d85 |
children | b2c0bf061382 |
comparison
equal
deleted
inserted
replaced
109128:89fa0d8c2e83 | 109129:907fcf8bd2ef |
---|---|
3246 static EMACS_INT non_regular_inserted; | 3246 static EMACS_INT non_regular_inserted; |
3247 static EMACS_INT non_regular_nbytes; | 3247 static EMACS_INT non_regular_nbytes; |
3248 | 3248 |
3249 | 3249 |
3250 /* Read from a non-regular file. | 3250 /* Read from a non-regular file. |
3251 Read non_regular_trytry bytes max from non_regular_fd. | 3251 Read non_regular_nbytes bytes max from non_regular_fd. |
3252 Non_regular_inserted specifies where to put the read bytes. | 3252 Non_regular_inserted specifies where to put the read bytes. |
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 (void) | 3256 read_non_regular (Lisp_Object ignored) |
3257 { | 3257 { |
3258 EMACS_INT nbytes; | 3258 EMACS_INT nbytes; |
3259 | 3259 |
3260 immediate_quit = 1; | 3260 immediate_quit = 1; |
3261 QUIT; | 3261 QUIT; |
3269 | 3269 |
3270 /* Condition-case handler used when reading from non-regular files | 3270 /* Condition-case handler used when reading from non-regular files |
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 (void) | 3274 read_non_regular_quit (Lisp_Object ignored) |
3275 { | 3275 { |
3276 return Qnil; | 3276 return Qnil; |
3277 } | 3277 } |
3278 | 3278 |
3279 | 3279 |