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:9.0.1277: cursor may move with autocmd in Visual mode (#22116)

Browse Source 
Problem:    Cursor may move with autocmd in Visual mode.
Solution:   Restore "VIsual_active" before calling check_cursor().
            (closes vim/vim#11939)

49f0524fb5
This commit is contained in:
zeertzjq 2023-02-04 19:35:31 +08:00 committed by GitHub
parent 964ae205a5
commit 90333b24c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/autocmd.c
View File

@ -1535,6 +1535,7 @@ win_found:
globaldir = aco->globaldir; globaldir = aco->globaldir;
// the buffer contents may have changed // the buffer contents may have changed
VIsual_active = aco->save_VIsual_active;
check_cursor(); check_cursor();
if (curwin->w_topline > curbuf->b_ml.ml_line_count) { if (curwin->w_topline > curbuf->b_ml.ml_line_count) {
curwin->w_topline = curbuf->b_ml.ml_line_count; curwin->w_topline = curbuf->b_ml.ml_line_count;
@ -1563,14 +1564,16 @@ win_found:
curwin = save_curwin; curwin = save_curwin;
curbuf = curwin->w_buffer; curbuf = curwin->w_buffer;
prevwin = win_find_by_handle(aco->save_prevwin_handle); prevwin = win_find_by_handle(aco->save_prevwin_handle);
// In case the autocommand moves the cursor to a position that does not // In case the autocommand moves the cursor to a position that does not
// exist in curbuf // exist in curbuf
VIsual_active = aco->save_VIsual_active;
check_cursor(); check_cursor();
} }
} }
check_cursor(); // just in case lines got deleted
VIsual_active = aco->save_VIsual_active; VIsual_active = aco->save_VIsual_active;
check_cursor(); // just in case lines got deleted
if (VIsual_active) { if (VIsual_active) {
check_pos(curbuf, &VIsual); check_pos(curbuf, &VIsual);
} }

11
src/nvim/testdir/test_functions.vim
View File

@ -1511,7 +1511,7 @@ endfunc
func Test_setbufvar_options() func Test_setbufvar_options()
" This tests that aucmd_prepbuf() and aucmd_restbuf() properly restore the " This tests that aucmd_prepbuf() and aucmd_restbuf() properly restore the
" window layout. " window layout and cursor position.
call assert_equal(1, winnr('$')) call assert_equal(1, winnr('$'))
split dummy_preview split dummy_preview
resize 2 resize 2
@ -1525,11 +1525,20 @@ func Test_setbufvar_options()
execute 'belowright vertical split #' . dummy_buf execute 'belowright vertical split #' . dummy_buf
call assert_equal(wh, winheight(0)) call assert_equal(wh, winheight(0))
let dum1_id = win_getid() let dum1_id = win_getid()
call setline(1, 'foo')
normal! V$
call assert_equal(4, col('.'))
call setbufvar('dummy_preview', '&buftype', 'nofile')
call assert_equal(4, col('.'))
wincmd h wincmd h
let wh = winheight(0) let wh = winheight(0)
call setline(1, 'foo')
normal! V$
call assert_equal(4, col('.'))
let dummy_buf = bufnr('dummy_buf2', v:true) let dummy_buf = bufnr('dummy_buf2', v:true)
eval 'nofile'->setbufvar(dummy_buf, '&buftype') eval 'nofile'->setbufvar(dummy_buf, '&buftype')
call assert_equal(4, col('.'))
execute 'belowright vertical split #' . dummy_buf execute 'belowright vertical split #' . dummy_buf
call assert_equal(wh, winheight(0)) call assert_equal(wh, winheight(0))