adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 8.2.4154: ml_get error when exchanging windows in Visual mode

Browse Source 
Problem:    ml_get error when exchanging windows in Visual mode.
Solution:   Correct end of Visual area when entering another buffer.
This commit is contained in:
Bram Moolenaar
2022-01-20 13:32:50 +00:00
parent 4ac893f321
commit 05b2761548
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/testdir/test_visual.vim
View File

@ -1318,5 +1318,15 @@ func Test_visual_block_insert_round_off()
bwipe! bwipe!
endfunc endfunc
" this was causing an ml_get error
func Test_visual_exchange_windows()
enew!
new
call setline(1, ['foo', 'bar'])
exe "normal G\<C-V>gg\<C-W>\<C-X>OO\<Esc>"
bwipe!
bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -750,6 +750,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 */
/**/
4154,
/**/ /**/
4153, 4153,
/**/ /**/

7
src/window.c
View File

@ -1691,6 +1691,11 @@ win_exchange(long Prenum)
(void)win_comp_pos(); // recompute window positions (void)win_comp_pos(); // recompute window positions
if (wp->w_buffer != curbuf)
reset_VIsual_and_resel();
else if (VIsual_active)
wp->w_cursor = curwin->w_cursor;
win_enter(wp, TRUE); win_enter(wp, TRUE);
redraw_all_later(NOT_VALID); redraw_all_later(NOT_VALID);
} }
@ -5332,7 +5337,7 @@ frame_remove(frame_T *frp)
win_alloc_lines(win_T *wp) win_alloc_lines(win_T *wp)
{ {
wp->w_lines_valid = 0; wp->w_lines_valid = 0;
wp->w_lines = ALLOC_CLEAR_MULT(wline_T, Rows ); wp->w_lines = ALLOC_CLEAR_MULT(wline_T, Rows);
if (wp->w_lines == NULL) if (wp->w_lines == NULL)
return FAIL; return FAIL;
return OK; return OK;