mirror of
https://github.com/vim/vim.git
synced 2025-09-26 04:04:07 -04:00
patch 8.2.4626: Visual area not updated when removing sign in Visual mode
Problem: Visual area not fully updated when removing sign in Visual mode while scrolling. Solution: Adjust check for topline. (closes #10017)
This commit is contained in:
@@ -1730,7 +1730,7 @@ win_update(win_T *wp)
|
|||||||
if (mod_top != 0
|
if (mod_top != 0
|
||||||
&& wp->w_topline == mod_top
|
&& wp->w_topline == mod_top
|
||||||
&& (!wp->w_lines[0].wl_valid
|
&& (!wp->w_lines[0].wl_valid
|
||||||
|| wp->w_topline <= wp->w_lines[0].wl_lnum))
|
|| wp->w_topline == wp->w_lines[0].wl_lnum))
|
||||||
{
|
{
|
||||||
// w_topline is the first changed line and window is not scrolled,
|
// w_topline is the first changed line and window is not scrolled,
|
||||||
// the scrolling from changed lines will be done further down.
|
// the scrolling from changed lines will be done further down.
|
||||||
|
8
src/testdir/dumps/Test_display_scroll_update_visual.dump
Normal file
8
src/testdir/dumps/Test_display_scroll_update_visual.dump
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
| +0#0000e05#a8a8a8255@1>f+0#0000000#ffffff0|o+0&#e0e0e08@1| | +0&#ffffff0@53
|
||||||
|
| +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o@1| @54
|
||||||
|
| +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o@1| @54
|
||||||
|
| +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o@1| @54
|
||||||
|
| +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o@1| @54
|
||||||
|
| +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o@1| @54
|
||||||
|
| +0#0000e05#a8a8a8255@1|f+0#0000000#ffffff0|o@1| @54
|
||||||
|
|-+2&&@1| |V|I|S|U|A|L| |L|I|N|E| |-@1| +0&&@14|2| @8|2|,|1| @10|3@1|%|
|
@@ -256,6 +256,27 @@ func Test_display_scroll_at_topline()
|
|||||||
call StopVimInTerminal(buf)
|
call StopVimInTerminal(buf)
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_display_scroll_update_visual()
|
||||||
|
CheckScreendump
|
||||||
|
|
||||||
|
let lines =<< trim END
|
||||||
|
set scrolloff=0
|
||||||
|
call setline(1, repeat(['foo'], 10))
|
||||||
|
call sign_define('foo', { 'text': '>' })
|
||||||
|
call sign_place(1, 'bar', 'foo', bufnr(), { 'lnum': 2 })
|
||||||
|
call sign_place(2, 'bar', 'foo', bufnr(), { 'lnum': 1 })
|
||||||
|
autocmd CursorMoved * if getcurpos()[1] == 2 | call sign_unplace('bar', { 'id': 1 }) | endif
|
||||||
|
END
|
||||||
|
call writefile(lines, 'XupdateVisual.vim')
|
||||||
|
|
||||||
|
let buf = RunVimInTerminal('-S XupdateVisual.vim', #{rows: 8, cols: 60})
|
||||||
|
call term_sendkeys(buf, "VG7kk")
|
||||||
|
call VerifyScreenDump(buf, 'Test_display_scroll_update_visual', {})
|
||||||
|
|
||||||
|
call StopVimInTerminal(buf)
|
||||||
|
call delete('XupdateVisual.vim')
|
||||||
|
endfunc
|
||||||
|
|
||||||
" Test for 'eob' (EndOfBuffer) item in 'fillchars'
|
" Test for 'eob' (EndOfBuffer) item in 'fillchars'
|
||||||
func Test_eob_fillchars()
|
func Test_eob_fillchars()
|
||||||
" default value
|
" default value
|
||||||
|
@@ -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 */
|
||||||
|
/**/
|
||||||
|
4626,
|
||||||
/**/
|
/**/
|
||||||
4625,
|
4625,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user