From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 7 May 2010 14:35:04 +0000 (+0200)
Subject: updated for version 7.2.415
X-Git-Tag: v7.2.415
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad249fb74c3b6f566feb3498592757b30e446dfd;p=vim

updated for version 7.2.415
Problem:    Win32: Can't open a remote file when starting Vim.
Solution:   Don't invoke cygwin_conv_path() for URLs. (Tomoya Adachi)
---

diff --git a/src/main.c b/src/main.c
index 4e027ab8c..0330f6abc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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 a49ba72c9..3a4648b38 100644
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    415,
 /**/
     414,
 /**/