auto upstream

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 @@
+2012-12-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * fileio.c (internal_delete_file): Use bool for boolean.
+
 2012-12-15  Eli Zaretskii  <eliz@gnu.org>
 
         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)
   return Qt;
 }
 
-/* Delete file FILENAME, returning 1 if successful and 0 if failed.
+/* Delete file FILENAME, returning true if successful.
    This ignores `delete-by-moving-to-trash'.  */
 
-int
+bool
 internal_delete_file (Lisp_Object filename)
 {
   Lisp_Object tem;
diff --git a/src/lisp.h b/src/lisp.h
index 2e6ee20f962..22752e61986 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3204,7 +3204,7 @@ EXFUN (Fread_file_name, 6);     /* Not a normal DEFUN.  */
 extern Lisp_Object close_file_unwind (Lisp_Object);
 extern Lisp_Object restore_point_unwind (Lisp_Object);
 extern _Noreturn void report_file_error (const char *, Lisp_Object);
-extern int internal_delete_file (Lisp_Object);
+extern bool internal_delete_file (Lisp_Object);
 extern bool file_directory_p (const char *);
 extern bool file_accessible_directory_p (const char *);
 extern void syms_of_fileio (void);