forked from aniani/vim
patch 8.2.4996: setbufline() may change Visual selection
Problem: setbufline() may change Visual selection. (Qiming Zhao) Solution: Disable Visual mode when using another buffer. (closes #10466)
This commit is contained in:
@@ -144,6 +144,7 @@ set_buffer_lines(
|
|||||||
buf_T *curbuf_save = NULL;
|
buf_T *curbuf_save = NULL;
|
||||||
win_T *curwin_save = NULL;
|
win_T *curwin_save = NULL;
|
||||||
int is_curbuf = buf == curbuf;
|
int is_curbuf = buf == curbuf;
|
||||||
|
int save_VIsual_active = VIsual_active;
|
||||||
|
|
||||||
// When using the current buffer ml_mfp will be set if needed. Useful when
|
// When using the current buffer ml_mfp will be set if needed. Useful when
|
||||||
// setline() is used on startup. For other buffers the buffer must be
|
// setline() is used on startup. For other buffers the buffer must be
|
||||||
@@ -158,6 +159,7 @@ set_buffer_lines(
|
|||||||
|
|
||||||
if (!is_curbuf)
|
if (!is_curbuf)
|
||||||
{
|
{
|
||||||
|
VIsual_active = FALSE;
|
||||||
curbuf_save = curbuf;
|
curbuf_save = curbuf;
|
||||||
curwin_save = curwin;
|
curwin_save = curwin;
|
||||||
curbuf = buf;
|
curbuf = buf;
|
||||||
@@ -264,6 +266,7 @@ done:
|
|||||||
{
|
{
|
||||||
curbuf = curbuf_save;
|
curbuf = curbuf_save;
|
||||||
curwin = curwin_save;
|
curwin = curwin_save;
|
||||||
|
VIsual_active = save_VIsual_active;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -222,4 +222,20 @@ func Test_appendbufline_redraw()
|
|||||||
call delete('XscriptMatchCommon')
|
call delete('XscriptMatchCommon')
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_setbufline_select_mode()
|
||||||
|
new
|
||||||
|
call setline(1, ['foo', 'bar'])
|
||||||
|
call feedkeys("j^v2l\<C-G>", 'nx')
|
||||||
|
|
||||||
|
let bufnr = bufadd('Xdummy')
|
||||||
|
call bufload(bufnr)
|
||||||
|
call setbufline(bufnr, 1, ['abc'])
|
||||||
|
|
||||||
|
call feedkeys("x", 'nx')
|
||||||
|
call assert_equal(['foo', 'x'], getline(1, 2))
|
||||||
|
|
||||||
|
exe "bwipe! " .. bufnr
|
||||||
|
bwipe!
|
||||||
|
endfunc
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
|
@@ -734,6 +734,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
4996,
|
||||||
/**/
|
/**/
|
||||||
4995,
|
4995,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user