]> granicus.if.org Git - vim/commitdiff
patch 8.2.0525: Win32: typo in assignment and misplaced paren v8.2.0525
authorBram Moolenaar <Bram@vim.org>
Mon, 6 Apr 2020 21:49:50 +0000 (23:49 +0200)
committerBram Moolenaar <Bram@vim.org>
Mon, 6 Apr 2020 21:49:50 +0000 (23:49 +0200)
Problem:    Win32: typo in assignment and misplaced paren.
Solution:   Fix the syntax.

src/filepath.c
src/version.c

index c37455e852714df4aff6a3fcc647d5d889c2ebfd..81f90c3392d971c94ffd288b226d430c9fb05dee 100644 (file)
@@ -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)))
        {
index ae61cf2a6b2d43d7151be88b95af90ee35dbe9a3..40f5b145b94be16d9de43db18d23e5385ac8d3e9 100644 (file)
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    525,
 /**/
     524,
 /**/