[Emacs-diffs] trunk r113246: src/emacs.c (Fkill_emacs): Expand Vauto_save_list_file_name before unlinking it.

[Juanma Barranquero]

------------------------------------------------------------
revno: 113246
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14691
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Mon 2013-07-01 18:54:37 +0200
message:
  src/emacs.c (Fkill_emacs): Expand Vauto_save_list_file_name before unlinking 
it.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/emacs.c                    emacs.c-20091113204419-o5vbwnq5f7feedwu-241

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-06-30 22:29:23 +0000
+++ b/src/ChangeLog     2013-07-01 16:54:37 +0000
@@ -1,3 +1,8 @@
+2013-07-01  Juanma Barranquero  <address@hidden>
+
+       * emacs.c (Fkill_emacs): Expand Vauto_save_list_file_name before
+       unlinking it (bug#14691).
+
 2013-06-30  Michal Nazarewicz  <address@hidden>
 
        * buffer.c (FKill_buffer): Run `kill-buffer-query-functions'

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2013-06-24 00:31:31 +0000
+++ b/src/emacs.c       2013-07-01 16:54:37 +0000
@@ -1864,7 +1864,11 @@
      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