diff options
author | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-06-06 17:58:02 -0400 |
---|---|---|
committer | Jan Edmund Lazo <janedmundlazo@hotmail.com> | 2018-06-07 12:02:57 -0400 |
commit | e0d39d8e5330407be19575a6f57dde436a036df0 (patch) | |
tree | 4a3f7c47c9852326f37e7c1529affb326bf74476 | |
parent | 2d456f84d1f87ae9c8ca34db6c68b7d49b786193 (diff) | |
download | rneovim-e0d39d8e5330407be19575a6f57dde436a036df0.tar.gz rneovim-e0d39d8e5330407be19575a6f57dde436a036df0.tar.bz2 rneovim-e0d39d8e5330407be19575a6f57dde436a036df0.zip |
vim-patch:8.0.0256: missing changes to one file breaks test
Problem: Tests fail because some changes were not included.
Solution: Add changes to evalfunc.c
https://github.com/vim/vim/commit/3a29abcb6154d9f55ca8abd6d97e5822b97ac4b3
-rw-r--r-- | src/nvim/eval.c | 18 | ||||
-rw-r--r-- | test/functional/eval/setpos_spec.lua | 3 |
2 files changed, 8 insertions, 13 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index ffea88aa83..d1f8ce75fa 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -14806,18 +14806,14 @@ static void f_setpos(typval_T *argvars, typval_T *rettv, FunPtr fptr) pos.col = 0; } if (name[0] == '.' && name[1] == NUL) { - // set cursor - if (fnum == curbuf->b_fnum) { - curwin->w_cursor = pos; - if (curswant >= 0) { - curwin->w_curswant = curswant - 1; - curwin->w_set_curswant = false; - } - check_cursor(); - rettv->vval.v_number = 0; - } else { - EMSG(_(e_invarg)); + // set cursor; "fnum" is ignored + curwin->w_cursor = pos; + if (curswant >= 0) { + curwin->w_curswant = curswant - 1; + curwin->w_set_curswant = false; } + check_cursor(); + rettv->vval.v_number = 0; } else if (name[0] == '\'' && name[1] != NUL && name[2] == NUL) { // set mark if (setmark_pos((uint8_t)name[1], &pos, fnum) == OK) { diff --git a/test/functional/eval/setpos_spec.lua b/test/functional/eval/setpos_spec.lua index 6a8b3a8732..935f387bcc 100644 --- a/test/functional/eval/setpos_spec.lua +++ b/test/functional/eval/setpos_spec.lua @@ -27,9 +27,8 @@ describe('setpos() function', function() eq(getpos("."), {0, 2, 1, 0}) setpos(".", {2, 1, 1, 0}) eq(getpos("."), {0, 1, 1, 0}) - -- Ensure get an error attempting to set position to another buffer local ret = exc_exec('call setpos(".", [1, 1, 1, 0])') - eq('Vim(call):E474: Invalid argument', ret) + eq(0, ret) end) it('can set lowercase marks in the current buffer', function() setpos("'d", {0, 2, 1, 0}) |