Mercurial > vim
comparison src/ex_getln.c @ 2495:a847363bf06e vim73
Fix a few problems for :find completion. Test much more. (Nazri Ramliy)
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Thu, 05 Aug 2010 21:40:16 +0200 |
parents | 04dae202d316 |
children | 6768ebd0bc04 |
comparison
equal
deleted
inserted
replaced
2494:ed997d0ceb26 | 2495:a847363bf06e |
---|---|
5043 /* Loop over all entries in {path}. */ | 5043 /* Loop over all entries in {path}. */ |
5044 while (*path != NUL) | 5044 while (*path != NUL) |
5045 { | 5045 { |
5046 /* Copy one item of the path to buf[] and concatenate the file name. */ | 5046 /* Copy one item of the path to buf[] and concatenate the file name. */ |
5047 copy_option_part(&path, buf, MAXPATHL, ","); | 5047 copy_option_part(&path, buf, MAXPATHL, ","); |
5048 if (path_with_url(buf)) | |
5049 continue; | |
5050 /* | |
5051 * FIXME: should we proactively skip 'path' with limiter (/usr/ **N) | |
5052 * and upward search (;) notations, just like we did with url above? | |
5053 */ | |
5054 if (STRLEN(buf) + STRLEN(file) + 2 < MAXPATHL) | 5048 if (STRLEN(buf) + STRLEN(file) + 2 < MAXPATHL) |
5055 { | 5049 { |
5050 # ifdef WIN3264 | |
5051 /* Using the platform's path separator (\) makes vim incorrectly | |
5052 * treat it as an escape character, use '/' instead. */ | |
5053 if (*buf != NUL && !after_pathsep(buf, buf + STRLEN(buf))) | |
5054 STRCAT(buf, "/"); | |
5055 # else | |
5056 add_pathsep(buf); | 5056 add_pathsep(buf); |
5057 # endif | |
5057 STRCAT(buf, file); | 5058 STRCAT(buf, file); |
5058 if (ExpandFromContext(&xpc, buf, &num_p, &p, | 5059 if (ExpandFromContext(&xpc, buf, &num_p, &p, |
5059 WILD_SILENT|expand_options) != FAIL && num_p > 0) | 5060 WILD_SILENT|expand_options) != FAIL && num_p > 0) |
5060 { | 5061 { |
5061 ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT|expand_options); | 5062 ExpandEscape(&xpc, buf, num_p, p, WILD_SILENT|expand_options); |