diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/emacs.c | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8b3f98fe9f..23e9502e3b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-07-01 Juanma Barranquero <[email protected]> + + * emacs.c (Fkill_emacs): Expand Vauto_save_list_file_name before + unlinking it (bug#14691). + 2013-06-30 Michal Nazarewicz <[email protected]> * buffer.c (FKill_buffer): Run `kill-buffer-query-functions' diff --git a/src/emacs.c b/src/emacs.c index 13f6d117eb..77ae977b37 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 |