diff options
| author | Paul Eggert | 2012-12-15 07:33:43 -0800 |
|---|---|---|
| committer | Paul Eggert | 2012-12-15 07:33:43 -0800 |
| commit | 7d80ea2365c6008ca187d09c244baaabb9a81773 (patch) | |
| tree | 7cda8261579a505f111cff551f6797900c79d02b /src | |
| parent | 07c40d4eaaec4e330345b225f60cf0f76d804c07 (diff) | |
| download | emacs-7d80ea2365c6008ca187d09c244baaabb9a81773.tar.gz emacs-7d80ea2365c6008ca187d09c244baaabb9a81773.zip | |
* fileio.c (internal_delete_file): Use bool for boolean.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/fileio.c | 4 | ||||
| -rw-r--r-- | src/lisp.h | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 34959cb691d..54dcfca6fd5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-12-15 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * fileio.c (internal_delete_file): Use bool for boolean. | ||
| 4 | |||
| 1 | 2012-12-15 Eli Zaretskii <eliz@gnu.org> | 5 | 2012-12-15 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | Fix bug #13079 on MS-Windows with temp files not being deleted. | 7 | Fix bug #13079 on MS-Windows with temp files not being deleted. |
diff --git a/src/fileio.c b/src/fileio.c index 9f263e36943..90626c4af0e 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -2203,10 +2203,10 @@ internal_delete_file_1 (Lisp_Object ignore) | |||
| 2203 | return Qt; | 2203 | return Qt; |
| 2204 | } | 2204 | } |
| 2205 | 2205 | ||
| 2206 | /* Delete file FILENAME, returning 1 if successful and 0 if failed. | 2206 | /* Delete file FILENAME, returning true if successful. |
| 2207 | This ignores `delete-by-moving-to-trash'. */ | 2207 | This ignores `delete-by-moving-to-trash'. */ |
| 2208 | 2208 | ||
| 2209 | int | 2209 | bool |
| 2210 | internal_delete_file (Lisp_Object filename) | 2210 | internal_delete_file (Lisp_Object filename) |
| 2211 | { | 2211 | { |
| 2212 | Lisp_Object tem; | 2212 | Lisp_Object tem; |
diff --git a/src/lisp.h b/src/lisp.h index 84a97c17bba..9af52c09782 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -3199,7 +3199,7 @@ EXFUN (Fread_file_name, 6); /* Not a normal DEFUN. */ | |||
| 3199 | extern Lisp_Object close_file_unwind (Lisp_Object); | 3199 | extern Lisp_Object close_file_unwind (Lisp_Object); |
| 3200 | extern Lisp_Object restore_point_unwind (Lisp_Object); | 3200 | extern Lisp_Object restore_point_unwind (Lisp_Object); |
| 3201 | extern _Noreturn void report_file_error (const char *, Lisp_Object); | 3201 | extern _Noreturn void report_file_error (const char *, Lisp_Object); |
| 3202 | extern int internal_delete_file (Lisp_Object); | 3202 | extern bool internal_delete_file (Lisp_Object); |
| 3203 | extern bool file_directory_p (const char *); | 3203 | extern bool file_directory_p (const char *); |
| 3204 | extern bool file_accessible_directory_p (const char *); | 3204 | extern bool file_accessible_directory_p (const char *); |
| 3205 | extern void syms_of_fileio (void); | 3205 | extern void syms_of_fileio (void); |