Mercurial > vim
changeset 7635:1506f86b120f v7.4.1117
commit https://github.com/vim/vim/commit/d82103ed8534a1207742e9666ac7ef1e47dda12d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 17 17:04:05 2016 +0100
patch 7.4.1117
Problem: No longer get "." and ".." in directory list.
Solution: Do not skip "." and ".." unless EW_DODOT is set.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 17 Jan 2016 17:15:04 +0100 |
parents | 39dc10ad4b19 |
children | 526427b465e3 |
files | src/misc1.c src/version.c |
diffstat | 2 files changed, 11 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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, flag 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, flag 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)