Mercurial > vim
diff src/window.c @ 13103:788d01164bb2 v8.0.1426
patch 8.0.1426: "gf" and <cfile> don't accept ? and & in URL
commit https://github.com/vim/vim/commit/9e3dfc650190e96739abc004eb9948afa68136b4
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Dec 25 14:29:18 2017 +0100
patch 8.0.1426: "gf" and <cfile> don't accept ? and & in URL
Problem: "gf" and <cfile> don't accept ? and & in URL. (Dmitrii Tcyganok)
Solution: Check for a URL and allow for extra characters. (closes https://github.com/vim/vim/issues/2493)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 25 Dec 2017 14:30:06 +0100 |
| parents | dd734ee3e2fe |
| children | 20fb8c711050 |
line wrap: on
line diff
--- a/src/window.c +++ b/src/window.c @@ -6081,7 +6081,6 @@ grab_file_name(long count, linenr_T *fil count, curbuf->b_ffname); } return file_name_at_cursor(options | FNAME_HYP, count, file_lnum); - } /* @@ -6120,6 +6119,8 @@ file_name_in_line( { char_u *ptr; int len; + int in_type = TRUE; + int is_url = FALSE; /* * search forward for what could be the start of a file name @@ -6158,8 +6159,19 @@ file_name_in_line( */ len = 0; while (vim_isfilec(ptr[len]) || (ptr[len] == '\\' && ptr[len + 1] == ' ') - || ((options & FNAME_HYP) && path_is_url(ptr + len))) - { + || ((options & FNAME_HYP) && path_is_url(ptr + len)) + || (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. */ + if ((ptr[len] >= 'A' && ptr[len] <= 'Z') || (ptr[len] >= 'a' && ptr[len] <= 'z')) + { + if (in_type && path_is_url(ptr + len + 1)) + is_url = TRUE; + } + else + in_type = FALSE; + if (ptr[len] == '\\') /* Skip over the "\" in "\ ". */ ++len;