mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch:8.2.3088: with 'virtualedit' set to "block" Visual highlight is wrong
Problem: With 'virtualedit' set to "block" Visual highlight is wrong after
using "$". (Marco Trosi)
Solution: Do not set w_old_cursor_lcol to MAXCOL. (closes vim/vim#8495)
9cee4a1c9c
This commit is contained in:
parent
c2a7e445ce
commit
37959e8865
@ -1186,9 +1186,12 @@ static void win_update(win_T *wp, Providers *providers)
|
||||
|
||||
getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc);
|
||||
ve_flags = save_ve_flags;
|
||||
++toc;
|
||||
if (curwin->w_curswant == MAXCOL)
|
||||
toc++;
|
||||
// Highlight to the end of the line, unless 'virtualedit' has
|
||||
// "block".
|
||||
if (curwin->w_curswant == MAXCOL && !(ve_flags & VE_BLOCK)) {
|
||||
toc = MAXCOL;
|
||||
}
|
||||
|
||||
if (fromc != wp->w_old_cursor_fcol
|
||||
|| toc != wp->w_old_cursor_lcol) {
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
source shared.vim
|
||||
source check.vim
|
||||
source screendump.vim
|
||||
|
||||
func Test_block_shift_multibyte()
|
||||
" Uses double-wide character.
|
||||
@ -1082,5 +1083,25 @@ func Test_visual_put_blockedit_zy_and_zp()
|
||||
bw!
|
||||
endfunc
|
||||
|
||||
func Test_visual_block_with_virtualedit()
|
||||
CheckScreendump
|
||||
|
||||
let lines =<< trim END
|
||||
call setline(1, ['aaaaaa', 'bbbb', 'cc'])
|
||||
set virtualedit=block
|
||||
normal G
|
||||
END
|
||||
call writefile(lines, 'XTest_block')
|
||||
|
||||
let buf = RunVimInTerminal('-S XTest_block', {'rows': 8, 'cols': 50})
|
||||
call term_sendkeys(buf, "\<C-V>gg$")
|
||||
call VerifyScreenDump(buf, 'Test_visual_block_with_virtualedit', {})
|
||||
|
||||
" clean up
|
||||
call term_sendkeys(buf, "\<Esc>")
|
||||
call StopVimInTerminal(buf)
|
||||
call delete('XTest_beval')
|
||||
endfunc
|
||||
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
Loading…
Reference in New Issue
Block a user