diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-08-01 19:14:13 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-08-01 19:14:13 +0200 |
| commit | f8992d47cd50494c64bb733329067c9de3c75200 (patch) | |
| tree | 9bf5664c4b44b08508d54000ce9c8a63168e84bb | |
| parent | 2c79e9d14dc0e61d8c357946d01107ec23ec0fe2 (diff) | |
patch 8.2.1345: Redraw error when using visual block and scrollv8.2.1345
Problem: Redraw error when using visual block and scroll.
Solution: Add check for w_topline. ( closes #6597)
| -rw-r--r-- | src/drawscreen.c | 9 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_display_visual_block_scroll.dump | 7 | ||||
| -rw-r--r-- | src/testdir/test_display.vim | 23 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 38 insertions, 3 deletions
diff --git a/src/drawscreen.c b/src/drawscreen.c index faecaa44bf..7afcf09754 100644 --- 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 diff --git a/src/testdir/dumps/Test_display_visual_block_scroll.dump b/src/testdir/dumps/Test_display_visual_block_scroll.dump new file mode 100644 index 0000000000..afb52fbb94 --- /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| diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim index ed111a585e..1e2ed455f0 100644 --- 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 diff --git a/src/version.c b/src/version.c index c6b6e8fd02..fb8a37ce5c 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1345, +/**/ 1344, /**/ 1343, |