diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-06-16 18:24:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-16 18:24:54 +0200 |
| commit | a503349e200dba09f5fc93363a3fc3a64dd7eeab (patch) | |
| tree | 5ce0d9f0f2f5bbf76821bb2965c94c793d0095f2 | |
| parent | 26dc628ab3a640b4f713d38c71623982fedc997a (diff) | |
| parent | de022d25707718029abdb539484dd242e36e4aa5 (diff) | |
| download | rneovim-a503349e200dba09f5fc93363a3fc3a64dd7eeab.tar.gz rneovim-a503349e200dba09f5fc93363a3fc3a64dd7eeab.tar.bz2 rneovim-a503349e200dba09f5fc93363a3fc3a64dd7eeab.zip | |
Merge #8569 from janlazo/vim-8.0.0602
| -rw-r--r-- | src/nvim/normal.c | 8 | ||||
| -rw-r--r-- | src/nvim/testdir/test_gf.vim | 27 |
2 files changed, 29 insertions, 6 deletions
diff --git a/src/nvim/normal.c b/src/nvim/normal.c index a7c4c255b7..6d3ffab030 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -5234,9 +5234,9 @@ static void nv_gotofile(cmdarg_T *cap) (void)autowrite(curbuf, false); } setpcmark(); - (void)do_ecmd(0, ptr, NULL, NULL, ECMD_LAST, - buf_hide(curbuf) ? ECMD_HIDE : 0, curwin); - if (cap->nchar == 'F' && lnum >= 0) { + if (do_ecmd(0, ptr, NULL, NULL, ECMD_LAST, + buf_hide(curbuf) ? ECMD_HIDE : 0, curwin) == OK + && cap->nchar == 'F' && lnum >= 0) { curwin->w_cursor.lnum = lnum; check_cursor_lnum(); beginline(BL_SOL | BL_FIX); @@ -7151,7 +7151,7 @@ static void set_op_var(int optype) assert(opchar0 >= 0 && opchar0 <= UCHAR_MAX); opchars[0] = (char) opchar0; - int opchar1 = get_extra_op_char(optype); + int opchar1 = get_extra_op_char(optype); assert(opchar1 >= 0 && opchar1 <= UCHAR_MAX); opchars[1] = (char) opchar1; diff --git a/src/nvim/testdir/test_gf.vim b/src/nvim/testdir/test_gf.vim index c4aa6f9218..ef1bf1075b 100644 --- a/src/nvim/testdir/test_gf.vim +++ b/src/nvim/testdir/test_gf.vim @@ -1,7 +1,7 @@ " This is a test if a URL is recognized by "gf", with the cursor before and " after the "://". Also test ":\\". -function! Test_gf_url() +func Test_gf_url() enew! call append(0, [ \ "first test for URL://machine.name/tmp/vimtest2a and other text", @@ -30,4 +30,27 @@ function! Test_gf_url() set isf&vim enew! -endfunction +endfunc + +func Test_gF() + new + call setline(1, ['111', '222', '333', '444']) + w! Xfile + close + new + set isfname-=: + call setline(1, ['one', 'Xfile:3', 'three']) + 2 + call assert_fails('normal gF', 'E37:') + call assert_equal(2, getcurpos()[1]) + w! Xfile2 + normal gF + call assert_equal('Xfile', bufname('%')) + call assert_equal(3, getcurpos()[1]) + + set isfname& + call delete('Xfile') + call delete('Xfile2') + bwipe Xfile + bwipe Xfile2 +endfunc |