diff options
| -rw-r--r-- | src/misc1.c | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/misc1.c b/src/misc1.c index 66569d4a0..fd63ec37f 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -10013,7 +10013,7 @@ dos_expandpath( if (p[0] == '*' && p[1] == '*') starstar = TRUE; - starts_with_dot = *s == '.' || (flags & EW_DODOT); + starts_with_dot = *s == '.'; pat = file_pat_to_reg_pat(s, e, NULL, FALSE); if (pat == NULL) { @@ -10096,8 +10096,9 @@ dos_expandpath( #endif /* Ignore entries starting with a dot, unless when asked for. Accept * all entries found with "matchname". */ - if ((p[0] != '.' || (starts_with_dot - && p[1] != NUL && (p[1] != '.' || p[2] != NUL))) + if ((p[0] != '.' || starts_with_dot + || ((flags & EW_DODOT) + && p[1] != NUL && (p[1] != '.' || p[2] != NUL))) && (matchname == NULL || (regmatch.regprog != NULL && vim_regexec(®match, p, (colnr_T)0)) @@ -10326,7 +10327,7 @@ unix_expandpath(gap, path, wildoff, flags, didstar) starstar = TRUE; /* convert the file pattern to a regexp pattern */ - starts_with_dot = *s == '.' || (flags & EW_DODOT); + starts_with_dot = *s == '.'; pat = file_pat_to_reg_pat(s, e, NULL, FALSE); if (pat == NULL) { @@ -10375,9 +10376,10 @@ unix_expandpath(gap, path, wildoff, flags, didstar) dp = readdir(dirp); if (dp == NULL) break; - if ((dp->d_name[0] != '.' || (starts_with_dot - && dp->d_name[1] != NUL - && (dp->d_name[1] != '.' || dp->d_name[2] != NUL))) + if ((dp->d_name[0] != '.' || starts_with_dot + || ((flags & EW_DODOT) + && dp->d_name[1] != NUL + && (dp->d_name[1] != '.' || dp->d_name[2] != NUL))) && ((regmatch.regprog != NULL && vim_regexec(®match, (char_u *)dp->d_name, (colnr_T)0)) || ((flags & EW_NOTWILD) diff --git a/src/version.c b/src/version.c index 50a682719..ee4ec0e01 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1117, +/**/ 1116, /**/ 1115, |