From 24827db9c4dd4597715958a3f6178cd2173251e1 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Mon, 1 Jul 2013 18:54:37 +0200 Subject: [PATCH] src/emacs.c (Fkill_emacs): Expand Vauto_save_list_file_name before unlinking it. Fixes: debbugs:14691 --- src/ChangeLog | 5 +++++ src/emacs.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 8b3f98fe9f3..23e9502e3b5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-07-01 Juanma Barranquero + + * emacs.c (Fkill_emacs): Expand Vauto_save_list_file_name before + unlinking it (bug#14691). + 2013-06-30 Michal Nazarewicz * buffer.c (FKill_buffer): Run `kill-buffer-query-functions' diff --git a/src/emacs.c b/src/emacs.c index 13f6d117ebc..77ae977b37c 100644 --- 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 -- 2.39.2