kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-21 19:55:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0602: when gF fails to edit the file the cursor still moves

Browse Source 
Problem:    When gF fails to edit the file the cursor still moves to the found
            line number.
Solution:   Check the return value of do_ecmd(). (Michael Hwang)
2a79ed293c
This commit is contained in:
Jan Edmund Lazo 2018-06-16 11:05:31 -04:00
parent eeeaf04c5e
commit 440c33343d
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/normal.c
View File

@ -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;

25
src/nvim/testdir/test_gf.vim
View File

@ -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,25 @@ 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
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])
call delete('Xfile')
call delete('Xfile2')
bwipe Xfile
bwipe Xfile2
endfunc