From 64b4c85637d9d5aa98ddc4f006f24cbd28727416 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Wed, 25 Aug 2021 11:58:27 +0200 Subject: [PATCH] Fix up deleting auto-save/killing buffer wrt. `auto-save-visited-mode' * src/buffer.c (Fkill_buffer): Respect `auto-save-visited-mode'. --- src/buffer.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 5951040ff2c..100ebc7e2de 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1798,11 +1798,15 @@ cleaning up all windows currently displaying the buffer to be killed. */) /* Delete the autosave file, if requested. */ if (modified - && STRINGP (BVAR (b, auto_save_file_name)) - && !NILP (Ffile_exists_p (BVAR (b, auto_save_file_name))) && kill_buffer_delete_auto_save_files && delete_auto_save_files - && !NILP (Frecent_auto_save_p ())) + && !NILP (Frecent_auto_save_p ()) + && STRINGP (BVAR (b, auto_save_file_name)) + && !NILP (Ffile_exists_p (BVAR (b, auto_save_file_name))) + /* If `auto-save-visited-mode' is on, then we're auto-saving + to the visited file -- don't delete it.. */ + && NILP (Fstring_equal (BVAR (b, auto_save_file_name), + BVAR (b, filename)))) { tem = do_yes_or_no_p (build_string ("Delete auto-save file? ")); if (!NILP (tem)) -- 2.39.2