--- a/src/emacs.c	Mon Aug 13 11:00:13 2007 +0200
+++ b/src/emacs.c	Mon Aug 13 11:01:07 2007 +0200
@@ -218,6 +218,7 @@
 Lisp_Object Qkill_emacs_hook;
 Lisp_Object Qsave_buffers_kill_emacs;
 
+extern Lisp_Object Vauto_save_list_file_name;
 
 /* Signal code for the fatal signal that was received */
 static int fatal_error_code;
@@ -867,8 +868,10 @@
       syms_of_abbrev ();
       syms_of_alloc ();
 #ifdef HAVE_X_WINDOWS
+#ifdef HAVE_BALLOON_HELP
       syms_of_balloon_x ();
 #endif
+#endif
       syms_of_buffer ();
       syms_of_bytecode ();
       syms_of_callint ();
@@ -1259,8 +1262,10 @@
       vars_of_abbrev ();
       vars_of_alloc ();
 #ifdef HAVE_X_WINDOWS
+#ifdef HAVE_BALLOON_HELP
       vars_of_balloon_x ();
 #endif
+#endif
       vars_of_buffer ();
       vars_of_bytecode ();
       vars_of_callint ();
@@ -2207,6 +2212,12 @@
 
   shut_down_emacs (0, ((STRINGP (arg)) ? arg : Qnil));
 
+  /* If we have an auto-save list file,
+     kill it because we are exiting Emacs deliberately (not crashing).
+     Do it after shut_down_emacs, which does an auto-save.  */
+  if (STRINGP (Vauto_save_list_file_name))
+      unlink ((char *) XSTRING_DATA (Vauto_save_list_file_name));
+
 #if defined(GNU_MALLOC)
   __free_hook = voodoo_free_hook;
 #endif