IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0998: getcurpos() unexpectedly changes "curswant"

Browse Source 
Problem:    getcurpos() unexpectedly changes "curswant".
Solution:   Save and restore "curswant". (closes vim/vim#4069)
19a66858a5
This commit is contained in:
Jan Edmund Lazo 2019-03-07 22:11:26 -05:00
parent 5f84b1dc41
commit 72e304c349
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/eval.c
View File

@ -10086,10 +10086,23 @@ static void getpos_both(typval_T *argvars, typval_T *rettv, bool getcurpos)
tv_list_append_number( tv_list_append_number(
l, (fp != NULL) ? (varnumber_T)fp->coladd : (varnumber_T)0); l, (fp != NULL) ? (varnumber_T)fp->coladd : (varnumber_T)0);
if (getcurpos) { if (getcurpos) {
const int save_set_curswant = curwin->w_set_curswant;
const colnr_T save_curswant = curwin->w_curswant;
const colnr_T save_virtcol = curwin->w_virtcol;
update_curswant(); update_curswant();
tv_list_append_number(l, (curwin->w_curswant == MAXCOL tv_list_append_number(l, (curwin->w_curswant == MAXCOL
? (varnumber_T)MAXCOL ? (varnumber_T)MAXCOL
: (varnumber_T)curwin->w_curswant + 1)); : (varnumber_T)curwin->w_curswant + 1));
// Do not change "curswant", as it is unexpected that a get
// function has a side effect.
if (save_set_curswant) {
curwin->w_set_curswant = save_set_curswant;
curwin->w_curswant = save_curswant;
curwin->w_virtcol = save_virtcol;
curwin->w_valid &= ~VALID_VIRTCOL;
}
} }
} }

15
src/nvim/testdir/test_visual.vim
View File

@ -1,8 +1,4 @@
" Tests for various Visual mode. " Tests for various Visual mode.
if !has('visual')
finish
endif
func Test_block_shift_multibyte() func Test_block_shift_multibyte()
" Uses double-wide character. " Uses double-wide character.
@ -318,3 +314,14 @@ func Test_Visual_sentence_textobject()
bwipe! bwipe!
endfunc endfunc
func Test_curswant_not_changed()
new
call setline(1, ['one', 'two'])
au InsertLeave * call getcurpos()
call feedkeys("gg0\<C-V>jI123 \<Esc>j", 'xt')
call assert_equal([0, 2, 1, 0, 1], getcurpos())
bwipe!
au! InsertLeave
endfunc