# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1552131905 -3600
# Node ID 58610c4d785cde03659200f8e59bc058dc570d07
# Parent  6a0f44d8d497e867c3fe0f7bc4f3c273d983d018
patch 8.1.1002: "gf" does not always work when URL has a port number

commit https://github.com/vim/vim/commit/cbef8e1aa1f260ffde16491b1678eae53a36cf68
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Mar 9 12:32:56 2019 +0100

    patch 8.1.1002: "gf" does not always work when URL has a port number

    Problem:    "gf" does not always work when URL has a port number. (Jakob
                Sch?ttl)
    Solution:   When a URL is recognized also accept ":". (closes #4082)

diff --git a/src/findfile.c b/src/findfile.c
--- a/src/findfile.c
+++ b/src/findfile.c
@@ -2017,10 +2017,10 @@ file_name_in_line(
     len = 0;
     while (vim_isfilec(ptr[len]) || (ptr[len] == '\\' && ptr[len + 1] == ' ')
 			 || ((options & FNAME_HYP) && path_is_url(ptr + len))
-			 || (is_url && vim_strchr((char_u *)"?&=", ptr[len]) != NULL))
+			 || (is_url && vim_strchr((char_u *)":?&=", ptr[len]) != NULL))
     {
-	// After type:// we also include ?, & and = as valid characters, so that
-	// http://google.com?q=this&that=ok works.
+	// After type:// we also include :, ?, & and = as valid characters, so that
+	// http://google.com:8080?q=this&that=ok works.
 	if ((ptr[len] >= 'A' && ptr[len] <= 'Z') || (ptr[len] >= 'a' && ptr[len] <= 'z'))
 	{
 	    if (in_type && path_is_url(ptr + len + 1))
diff --git a/src/testdir/test_gf.vim b/src/testdir/test_gf.vim
--- a/src/testdir/test_gf.vim
+++ b/src/testdir/test_gf.vim
@@ -9,6 +9,7 @@ func Test_gf_url()
       \ "third test for URL:\\\\machine.name\\vimtest2c and other text",
       \ "fourth test for URL:\\\\machine.name\\tmp\\vimtest2d, and other text",
       \ "fifth test for URL://machine.name/tmp?q=vim&opt=yes and other text",
+      \ "sixth test for URL://machine.name:1234?q=vim and other text",
       \ ])
   call cursor(1,1)
   call search("^first")
@@ -20,7 +21,7 @@ func Test_gf_url()
   if has("ebcdic")
       set isf=@,240-249,/,.,-,_,+,,,$,:,~,\
   else
-      set isf=@,48-57,/,.,-,_,+,,,$,:,~,\
+      set isf=@,48-57,/,.,-,_,+,,,$,~,\
   endif
   call search("^third")
   call search("name")
@@ -33,6 +34,10 @@ func Test_gf_url()
   call search("URL")
   call assert_equal("URL://machine.name/tmp?q=vim&opt=yes", expand("<cfile>"))
 
+  call search("^sixth")
+  call search("URL")
+  call assert_equal("URL://machine.name:1234?q=vim", expand("<cfile>"))
+
   set isf&vim
   enew!
 endfunc
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1002,
+/**/
     1001,
 /**/
     1000,