Mercurial > vim
changeset 21590:5f4a188dead8 v8.2.1345
patch 8.2.1345: Redraw error when using visual block and scroll
Commit: https://github.com/vim/vim/commit/f8992d47cd50494c64bb733329067c9de3c75200
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Aug 1 19:14:13 2020 +0200
patch 8.2.1345: Redraw error when using visual block and scroll
Problem: Redraw error when using visual block and scroll.
Solution: Add check for w_topline. ( closes https://github.com/vim/vim/issues/6597)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 01 Aug 2020 19:15:03 +0200 |
| parents | a38f99a23aa8 |
| children | 37e648dc29fe |
| files | src/drawscreen.c src/testdir/dumps/Test_display_visual_block_scroll.dump src/testdir/test_display.vim src/version.c |
| diffstat | 4 files changed, 38 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/drawscreen.c +++ b/src/drawscreen.c @@ -1659,10 +1659,13 @@ win_update(win_T *wp) #endif ) { - if (mod_top != 0 && wp->w_topline == mod_top) + if (mod_top != 0 + && wp->w_topline == mod_top + && (!wp->w_lines[0].wl_valid + || wp->w_topline == wp->w_lines[0].wl_lnum)) { - // w_topline is the first changed line, the scrolling will be done - // further down. + // w_topline is the first changed line and window is not scrolled, + // the scrolling from changed lines will be done further down. } else if (wp->w_lines[0].wl_valid && (wp->w_topline < wp->w_lines[0].wl_lnum
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_display_visual_block_scroll.dump @@ -0,0 +1,7 @@ +|{+0&#e0e0e08| | +0&#ffffff0@72 +|}+0&#e0e0e08| | +0&#ffffff0@72 +|{+0&#e0e0e08| | +0&#ffffff0@72 +|f+0&#e0e0e08| | +0&#ffffff0@72 +>g| +0&#e0e0e08| +0&#ffffff0@72 +|}| @73 +|-+2&&@1| |V|I|S|U|A|L| |L|I|N|E| |-@1| +0&&@29|7| @8|1@1|,|1| @9|B|o|t|
--- a/src/testdir/test_display.vim +++ b/src/testdir/test_display.vim @@ -220,3 +220,26 @@ func Test_unprintable_fileformats() call delete('Xmac.txt') call delete(filename) endfunc + +" Test for scrolling that modifies buffer during visual block +func Test_visual_block_scroll() + CheckScreendump + + let lines =<< trim END + source $VIMRUNTIME/plugin/matchparen.vim + set scrolloff=1 + call setline(1, ['a', 'b', 'c', 'd', 'e', '', '{', '}', '{', 'f', 'g', '}']) + call cursor(5, 1) + END + + let filename = 'Xvisualblockmodifiedscroll' + call writefile(lines, filename) + + let buf = RunVimInTerminal('-S '.filename, #{rows: 7}) + call term_sendkeys(buf, "V\<C-D>\<C-D>") + + call VerifyScreenDump(buf, 'Test_display_visual_block_scroll', {}) + + call StopVimInTerminal(buf) + call delete(filename) +endfunc