aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/screen.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2014-12-26 14:29:32 -0500
committerJustin M. Keyes <justinkz@gmail.com>2014-12-26 14:29:32 -0500
commit775361728a4b71e696b422a20c57e6ee0d538c13 (patch)
tree8d80768ad44b11cb964c36e280eb78c01668deec /src/nvim/screen.c
parentcab88790bcf8fa4ae5a634b1ccaf84d337fa47e2 (diff)
parent28d3923bd8123b0e57f1f9ffef57356f19476915 (diff)
downloadrneovim-775361728a4b71e696b422a20c57e6ee0d538c13.tar.gz
rneovim-775361728a4b71e696b422a20c57e6ee0d538c13.tar.bz2
rneovim-775361728a4b71e696b422a20c57e6ee0d538c13.zip
Merge pull request #1734 from fwalch/small-patches
vim-patch: Multiple small patches (4)
Diffstat (limited to 'src/nvim/screen.c')
-rw-r--r--src/nvim/screen.c7
1 files changed, 6 insertions, 1 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);