changeset 19938:f33098f1aec0 v8.2.0525

patch 8.2.0525: Win32: typo in assignment and misplaced paren Commit: https://github.com/vim/vim/commit/40655d501649e0b73e12f940b56f462dee44e06c Author: Bram Moolenaar <Bram@vim.org> Date: Mon Apr 6 23:49:50 2020 +0200 patch 8.2.0525: Win32: typo in assignment and misplaced paren Problem: Win32: typo in assignment and misplaced paren. Solution: Fix the syntax.
author Bram Moolenaar <Bram@vim.org>
date Tue, 07 Apr 2020 00:01:14 +0200
parents 87711a925c87
children 09b34a0c8a93
files src/filepath.c src/version.c
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/filepath.c
+++ b/src/filepath.c
@@ -3168,7 +3168,7 @@ dos_expandpath(
 	    break;  // out of memory
 
 	if (*wfb.cAlternateFileName == NUL)
-	    p_alt == NULL;
+	    p_alt = NULL;
 	else
 	    p_alt = utf16_to_enc(wfb.cAlternateFileName, NULL);
 
@@ -3179,10 +3179,9 @@ dos_expandpath(
 			     && p[1] != NUL && (p[1] != '.' || p[2] != NUL)))
 		&& (matchname == NULL
 		  || (regmatch.regprog != NULL
-		     && (vim_regexec(&regmatch, p, (colnr_T)0)
+		      && (vim_regexec(&regmatch, p, (colnr_T)0)
 			 || (p_alt != NULL
-				 && vim_regexec(&regmatch, p_alt, (colnr_T)0)))
-		     ))
+				&& vim_regexec(&regmatch, p_alt, (colnr_T)0))))
 		  || ((flags & EW_NOTWILD)
 		     && fnamencmp(path + (s - buf), p, e - s) == 0)))
 	{
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    525,
+/**/
     524,
 /**/
     523,