diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-03-09 12:32:56 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-03-09 12:32:56 +0100 |
| commit | cbef8e1aa1f260ffde16491b1678eae53a36cf68 (patch) | |
| tree | 15ef88aafc3ab3f1896e0be21fc2e7fef7a2c69f | |
| parent | 8156ed37558231a8167a1a61a147713d84c9af59 (diff) | |
patch 8.1.1002: "gf" does not always work when URL has a port numberv8.1.1002
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)
| -rw-r--r-- | src/findfile.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_gf.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/findfile.c b/src/findfile.c index 9730b35a46..690cd8fb19 100644 --- 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 index c352379697..d233046d2b 100644 --- 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 index 248b8414b7..1d0f90dd18 100644 --- 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, |