diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-04-06 23:49:50 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-04-06 23:49:50 +0200 |
| commit | 40655d501649e0b73e12f940b56f462dee44e06c (patch) | |
| tree | be66d7aa8e4ca3a90b392c95fe753c3783884280 | |
| parent | c74fbfedfa2df384cca5f6763e2c9e5c0ca6d513 (diff) | |
| download | vim-git-40655d501649e0b73e12f940b56f462dee44e06c.tar.gz | |
patch 8.2.0525: Win32: typo in assignment and misplaced parenv8.2.0525
Problem: Win32: typo in assignment and misplaced paren.
Solution: Fix the syntax.
| -rw-r--r-- | src/filepath.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/filepath.c b/src/filepath.c index c37455e85..81f90c339 100644 --- 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(®match, p, (colnr_T)0) + && (vim_regexec(®match, p, (colnr_T)0) || (p_alt != NULL - && vim_regexec(®match, p_alt, (colnr_T)0))) - )) + && vim_regexec(®match, p_alt, (colnr_T)0)))) || ((flags & EW_NOTWILD) && fnamencmp(path + (s - buf), p, e - s) == 0))) { diff --git a/src/version.c b/src/version.c index ae61cf2a6..40f5b145b 100644 --- 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, |