0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.0217

This commit is contained in:
Bram Moolenaar
2006-03-07 22:29:51 +00:00
parent 362e1a30c6
commit a203182302
11 changed files with 36 additions and 19 deletions

View File

@@ -2610,8 +2610,6 @@ mch_isdir(name)
#endif
}
#if defined(FEAT_EVAL) || defined(PROTO)
static int executable_file __ARGS((char_u *name));
/*
@@ -2681,7 +2679,6 @@ mch_can_exe(name)
vim_free(buf);
return retval;
}
#endif
/*
* Check what "name" is:
@@ -4924,6 +4921,10 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
if ((dir && !(flags & EW_DIR)) || (!dir && !(flags & EW_FILE)))
continue;
/* Skip files that are not executable if we check for that. */
if (!dir && (flags & EW_EXEC) && !mch_can_exe(p))
continue;
if (--files_free == 0)
{
/* need more room in table of pointers */
@@ -5390,6 +5391,10 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
if ((dir && !(flags & EW_DIR)) || (!dir && !(flags & EW_FILE)))
continue;
/* Skip files that are not executable if we check for that. */
if (!dir && (flags & EW_EXEC) && !mch_can_exe((*file)[i]))
continue;
p = alloc((unsigned)(STRLEN((*file)[i]) + 1 + dir));
if (p)
{