src/emacs.c (Fkill_emacs): Expand Vauto_save_list_file_name before unlinking it.

Fixes: debbugs:14691

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b3f98fe9f3904bbeba066bdefe381885baf040b..23e9502e3b5c87ef81893934012ba7c05043617d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-01  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacs.c (Fkill_emacs): Expand Vauto_save_list_file_name before
+       unlinking it (bug#14691).
+
 2013-06-30  Michal Nazarewicz  <mina86@mina86.com>
 
        * buffer.c (FKill_buffer): Run `kill-buffer-query-functions'

diff --git a/src/emacs.c b/src/emacs.c
index 13f6d117ebc5ea7559fe2c199d06d9471453b092..77ae977b37ce643768afc963de8920d23e52dd7d 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1864,7 +1864,11 @@ all of which are called before Emacs is actually killed.  */)
      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 (SSDATA (Vauto_save_list_file_name));
+    {
+      Lisp_Object listfile;
+      listfile = Fexpand_file_name (Vauto_save_list_file_name, Qnil);
+      unlink (SSDATA (listfile));
+    }
 
   if (INTEGERP (arg))
     exit_code = (XINT (arg) < 0