aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.1117

Browse Source 
Problem:    No longer get "." and ".." in directory list.
Solution:   Do not skip "." and ".." unless EW_DODOT is set.
This commit is contained in:
Bram Moolenaar 2016-01-17 17:04:05 +01:00
parent b0967d587f
commit d82103ed85
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/misc1.c
View File

@ -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(&regmatch, 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(&regmatch,
(char_u *)dp->d_name, (colnr_T)0))
|| ((flags & EW_NOTWILD)

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1117,
/**/
1116,
/**/