aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/screen.c7
-rw-r--r--src/nvim/version.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 0148979335..324171aca2 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2962,8 +2962,13 @@ win_line (
if (shl->startcol != MAXCOL
&& v >= (long)shl->startcol
&& v < (long)shl->endcol) {
+ int tmp_col = v + MB_PTR2LEN(ptr);
+
+ if (shl->endcol < tmp_col) {
+ shl->endcol = tmp_col;
+ }
shl->attr_cur = shl->attr;
- } else if (v >= (long)shl->endcol && shl->lnum == lnum) {
+ } else if (v == (long)shl->endcol) {
shl->attr_cur = 0;
next_search_hl(wp, shl, lnum, (colnr_T)v, cur);
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9c0188e416..22b7b54019 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -193,7 +193,7 @@ static int included_patches[] = {
//548 NA
//547,
//546,
- //545,
+ 545,
//544 NA
543,
//542,