Skip to content

Commit a3e4705

Browse files
committed
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.
1 parent e928956 commit a3e4705

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/ex_cmds.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2004,11 +2004,14 @@ write_viminfo(file, forceit)
20042004
{
20052005
fclose(fp_in);
20062006

2007-
/*
2008-
* In case of an error keep the original viminfo file.
2009-
* Otherwise rename the newly written file.
2010-
*/
2011-
if (viminfo_errcnt || vim_rename(tempname, fname) == -1)
2007+
/* In case of an error keep the original viminfo file. Otherwise
2008+
* rename the newly written file. Give an error if that fails. */
2009+
if (viminfo_errcnt == 0 && vim_rename(tempname, fname) == -1)
2010+
{
2011+
++viminfo_errcnt;
2012+
EMSG2(_("E886: Can't rename viminfo file to %s!"), fname);
2013+
}
2014+
if (viminfo_errcnt > 0)
20122015
mch_remove(tempname);
20132016

20142017
#ifdef WIN3264

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,8 @@ static char *(features[]) =
734734

735735
static int included_patches[] =
736736
{ /* Add new patch number below this line */
737+
/**/
738+
364,
737739
/**/
738740
363,
739741
/**/

0 commit comments

Comments
 (0)