From 3ed8b1332f7b84e40c89069e54d411d0ddfec3f1 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 9 Jul 2014 21:18:04 +0200
Subject: [PATCH] updated for version 7.4.364 Problem:    When the viminfo file
 can't be renamed there is no error message.             (Vladimir Berezhnoy)
 Solution:   Check for the rename to fail.

---
 src/ex_cmds.c | 13 ++++++++-----
 src/version.c |  2 ++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 2e5917f4a2..62621bfa57 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2004,11 +2004,14 @@ write_viminfo(file, forceit)
     {
 	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)
 	    mch_remove(tempname);
 
 #ifdef WIN3264
diff --git a/src/version.c b/src/version.c
index 150a950e7e..0bfd039de6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    364,
 /**/
     363,
 /**/