diff options
author | Bram Moolenaar <bram@zimbu.org> | 2010-05-07 16:35:04 +0200 |
---|---|---|
committer | Bram Moolenaar <bram@zimbu.org> | 2010-05-07 16:35:04 +0200 |
commit | 851cc2023f9ca30def33b571c2a426c0b5aafa63 (patch) | |
tree | 008ac8af81e36b97ce09df6624ea8028fd048999 | |
parent | d01768f8f0496e2dd28b46fa9bd018bdc997308a (diff) | |
download | vim-851cc2023f9ca30def33b571c2a426c0b5aafa63.tar.gz |
Problem: Win32: Can't open a remote file when starting Vim.
Solution: Don't invoke cygwin_conv_path() for URLs. (Tomoya Adachi)
-rw-r--r-- | src/main.c | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
@@ -1477,7 +1477,7 @@ parse_command_name(parmp) ++initstr; } - /* Avoid using evim mode for "editor". */ + /* Use evim mode for "evim" and "egvim", not for "editor". */ if (TOLOWER_ASC(initstr[0]) == 'e' && (TOLOWER_ASC(initstr[1]) == 'v' || TOLOWER_ASC(initstr[1]) == 'g')) @@ -2262,7 +2262,7 @@ scripterror: * Look for evidence of non-Cygwin paths before we bother. * This is only for when using the Unix files. */ - if (strpbrk(p, "\\:") != NULL) + if (strpbrk(p, "\\:") != NULL && !path_with_url(p)) { char posix_path[PATH_MAX]; diff --git a/src/version.c b/src/version.c index a49ba72c..3a4648b3 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 415, +/**/ 414, /**/ 413, |