comparison src/filepath.c @ 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 ce463840c826
children 4c317d8c1051
comparison
equal deleted inserted replaced
19937:87711a925c87 19938:f33098f1aec0
3166 3166
3167 if (p == NULL) 3167 if (p == NULL)
3168 break; // out of memory 3168 break; // out of memory
3169 3169
3170 if (*wfb.cAlternateFileName == NUL) 3170 if (*wfb.cAlternateFileName == NUL)
3171 p_alt == NULL; 3171 p_alt = NULL;
3172 else 3172 else
3173 p_alt = utf16_to_enc(wfb.cAlternateFileName, NULL); 3173 p_alt = utf16_to_enc(wfb.cAlternateFileName, NULL);
3174 3174
3175 // Ignore entries starting with a dot, unless when asked for. Accept 3175 // Ignore entries starting with a dot, unless when asked for. Accept
3176 // all entries found with "matchname". 3176 // all entries found with "matchname".
3177 if ((p[0] != '.' || starts_with_dot 3177 if ((p[0] != '.' || starts_with_dot
3178 || ((flags & EW_DODOT) 3178 || ((flags & EW_DODOT)
3179 && p[1] != NUL && (p[1] != '.' || p[2] != NUL))) 3179 && p[1] != NUL && (p[1] != '.' || p[2] != NUL)))
3180 && (matchname == NULL 3180 && (matchname == NULL
3181 || (regmatch.regprog != NULL 3181 || (regmatch.regprog != NULL
3182 && (vim_regexec(&regmatch, p, (colnr_T)0) 3182 && (vim_regexec(&regmatch, p, (colnr_T)0)
3183 || (p_alt != NULL 3183 || (p_alt != NULL
3184 && vim_regexec(&regmatch, p_alt, (colnr_T)0))) 3184 && vim_regexec(&regmatch, p_alt, (colnr_T)0))))
3185 ))
3186 || ((flags & EW_NOTWILD) 3185 || ((flags & EW_NOTWILD)
3187 && fnamencmp(path + (s - buf), p, e - s) == 0))) 3186 && fnamencmp(path + (s - buf), p, e - s) == 0)))
3188 { 3187 {
3189 STRCPY(s, p); 3188 STRCPY(s, p);
3190 len = (int)STRLEN(buf); 3189 len = (int)STRLEN(buf);