diff options
| author | Bram Moolenaar <Bram@vim.org> | 2011-07-27 17:31:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2011-07-27 17:31:47 +0200 |
| commit | 0b573a58e63f43f462e6824080c633bbd1a8a5dd (patch) | |
| tree | 12c949bd62bf37417834b51a1fd26c0c05d838f7 /src/misc2.c | |
| parent | a171162356bd7f8b11f9af1061591316fc8dad3d (diff) | |
| download | vim-git-0b573a58e63f43f462e6824080c633bbd1a8a5dd.tar.gz | |
updated for version 7.3.264v7.3.264
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.
Diffstat (limited to 'src/misc2.c')
| -rw-r--r-- | src/misc2.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/misc2.c b/src/misc2.c index dfb1fc487..f91a64ace 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -4653,9 +4653,8 @@ vim_findfile_stopdir(buf) { if (r_ptr[0] == '\\' && r_ptr[1] == ';') { - /* overwrite the escape char, - * use STRLEN(r_ptr) to move the trailing '\0' - */ + /* Overwrite the escape char, + * use STRLEN(r_ptr) to move the trailing '\0'. */ STRMOVE(r_ptr, r_ptr + 1); r_ptr++; } @@ -4914,10 +4913,13 @@ vim_findfile(search_ctx_arg) stackp->ffs_filearray_size = 0; } else + /* Add EW_NOTWILD because the expanded path may contain + * wildcard characters that are to be taken literally. + * This is a bit of a hack. */ expand_wildcards((dirptrs[1] == NULL) ? 1 : 2, dirptrs, &stackp->ffs_filearray_size, &stackp->ffs_filearray, - EW_DIR|EW_ADDSLASH|EW_SILENT); + EW_DIR|EW_ADDSLASH|EW_SILENT|EW_NOTWILD); stackp->ffs_filearray_cur = 0; stackp->ffs_stage = 0; |