1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/shada.c b/src/nvim/shada.c
index bd3fd731e3..40037026a1 100644
--- a/src/nvim/shada.c
+++ b/src/nvim/shada.c
@@ -3001,11 +3001,13 @@ shada_write_file_nomerge: {}
 
   if (!nomerge) {
     sd_reader.close(&sd_reader);
+    bool did_remove = false;
     if (sw_ret == kSDWriteSuccessfull) {
       if (vim_rename(tempname, fname) == -1) {
         EMSG3(_(RNERR "Can't rename ShaDa file from %s to %s!"),
               tempname, fname);
       } else {
+        did_remove = true;
         os_remove(tempname);
       }
     } else {
@@ -3017,6 +3019,10 @@ shada_write_file_nomerge: {}
                 "during writing it"), tempname, fname);
       }
     }
+    if (!did_remove) {
+      EMSG3(_(RNERR "Do not forget to remove %s or rename it manually to %s."),
+            tempname, fname);
+    }
     xfree(tempname);
   }