aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/screen.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-07-04 11:00:48 -0400
committerGitHub <noreply@github.com>2021-07-04 11:00:48 -0400
commit18bfcfe77f007f146a7251aa3cc6129891390c30 (patch)
tree741849ac08038690779f833bb33d204ba4978eee /src/nvim/screen.c
parent490615612ed5ec587c8023de28db495b3181de30 (diff)
parent0d75b0d8d470fdf763743823feb6d9013eff069c (diff)
downloadrneovim-18bfcfe77f007f146a7251aa3cc6129891390c30.tar.gz
rneovim-18bfcfe77f007f146a7251aa3cc6129891390c30.tar.bz2
rneovim-18bfcfe77f007f146a7251aa3cc6129891390c30.zip
Merge pull request #14981 from janlazo/vim-8.2.3081
vim-patch:8.2.{3081,3082,3085,3087,3088,3093,3094,3097,3098}
Diffstat (limited to 'src/nvim/screen.c')
-rw-r--r--src/nvim/screen.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 3446a944cd..cab41d1783 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -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) {