1 files changed, 7 insertions, 5 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index b72d1941ec..163d20f13a 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -1648,11 +1648,13 @@ void write_viminfo(char_u *file, int forceit)
   if (fp_in != NULL) {
     fclose(fp_in);
 
-    /*
-     * In case of an error keep the original viminfo file.
-     * Otherwise rename the newly written file.
-     */
-    if (viminfo_errcnt || vim_rename(tempname, fname) == -1) {
+    /* In case of an error keep the original viminfo file. Otherwise
+     * rename the newly written file. Give an error if that fails. */
+    if (viminfo_errcnt == 0 && vim_rename(tempname, fname) == -1) {
+      viminfo_errcnt++;
+      EMSG2(_("E886: Can't rename viminfo file to %s!"), fname);
+    }
+    if (viminfo_errcnt > 0) {
       os_remove((char *)tempname);
     }
   }