--- a/src/buffer.c	Mon Aug 13 09:32:45 2007 +0200
+++ b/src/buffer.c	Mon Aug 13 09:33:18 2007 +0200
@@ -166,7 +166,7 @@
 Lisp_Object Vkill_buffer_query_functions;
 
 /* Non-nil means delete a buffer's auto-save file when the buffer is saved. */
-Lisp_Object Vdelete_auto_save_files;
+int Vdelete_auto_save_files;
 
 Lisp_Object Qbuffer_live_p;
 Lisp_Object Qbuffer_or_string_p;
@@ -1384,7 +1384,7 @@
 	&& b->auto_save_modified != 0
 	&& BUF_SAVE_MODIFF (b) < b->auto_save_modified)
       {
-	if (!NILP (Vdelete_auto_save_files))
+	if (Vdelete_auto_save_files != 0)
 	  {
 	    /* deleting the auto save file might kill b! */
 	    /* #### dmoore - fix this crap, we do this same gcpro and
@@ -2088,10 +2088,10 @@
 */ );
   Vkill_buffer_query_functions = Qnil;
 
-  DEFVAR_LISP ("delete-auto-save-files", &Vdelete_auto_save_files /*
+  DEFVAR_BOOL ("delete-auto-save-files", &Vdelete_auto_save_files /*
 *Non-nil means delete auto-save file when a buffer is saved or killed.
 */ );
-  Vdelete_auto_save_files = Qt;
+  Vdelete_auto_save_files = 1;
 }
 
 /* DOC is ignored because it is snagged and recorded externally