From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 7 Feb 2021 13:01:35 +0000 (+0100)
Subject: patch 8.2.2478: MS-Windows: backup files for plugins are loaded
X-Git-Tag: v8.2.2478
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0dc5f603e9b86da9fe5798c231d8d6170501516e;p=vim

patch 8.2.2478: MS-Windows: backup files for plugins are loaded

Problem:    MS-Windows: backup files for plugins are loaded.
Solution:   Do not use the alternate file name for files ending in "~".
---

diff --git a/src/filepath.c b/src/filepath.c
index 81fe74924..8e54e5bcf 100644
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -3360,7 +3360,10 @@ dos_expandpath(
 	if (p == NULL)
 	    break;  // out of memory
 
-	if (*wfb.cAlternateFileName == NUL)
+	// Do not use the alternate filename when the file name ends in '~',
+	// because it picks up backup files: short name for "foo.vim~" is
+	// "foo~1.vim", which matches "*.vim".
+	if (*wfb.cAlternateFileName == NUL || p[STRLEN(p) - 1] == '~')
 	    p_alt = NULL;
 	else
 	    p_alt = utf16_to_enc(wfb.cAlternateFileName, NULL);
diff --git a/src/version.c b/src/version.c
index 7a91c9bae..ae61a32c8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2478,
 /**/
     2477,
 /**/