thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.264

Browse Source 
Problem:    When the current directory name contains wildcard characters, such
            as "foo[with]bar", the tags file can't be found.  (Jeremy
            Erickson)
Solution:   When searching for matching files also match without expanding
            wildcards.  This is a bit of a hack.
This commit is contained in:
Bram Moolenaar
2011-07-27 17:31:47 +02:00
parent a171162356
commit 0b573a58e6
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/misc1.c
View File

@@ -9119,7 +9119,9 @@ dos_expandpath(
* all entries found with "matchname". */
if ((p[0] != '.' || starts_with_dot)
&& (matchname == NULL
|| vim_regexec(&regmatch, p, (colnr_T)0)))
|| vim_regexec(&regmatch, p, (colnr_T)0)
|| ((flags & EW_NOTWILD)
&& fnamencmp(path + (s - buf), p, e - s) == 0)))
{
#ifdef WIN3264
STRCPY(s, p);
@@ -9323,7 +9325,7 @@ unix_expandpath(gap, path, wildoff, flags, didstar)
e = p;
*e = NUL;
/* now we have one wildcard component between "s" and "e" */
/* Now we have one wildcard component between "s" and "e". */
/* Remove backslashes between "wildoff" and the start of the wildcard
* component. */
for (p = buf + wildoff; p < s; ++p)
@@ -9390,7 +9392,9 @@ unix_expandpath(gap, path, wildoff, flags, didstar)
if (dp == NULL)
break;
if ((dp->d_name[0] != '.' || starts_with_dot)
&& vim_regexec(&regmatch, (char_u *)dp->d_name, (colnr_T)0))
&& (vim_regexec(&regmatch, (char_u *)dp->d_name, (colnr_T)0)
|| ((flags & EW_NOTWILD)
&& fnamencmp(path + (s - buf), dp->d_name, e - s) == 0)))
{
STRCPY(s, dp->d_name);
len = STRLEN(buf);