aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/plines.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/plines.c b/src/nvim/plines.c
index ae6d16b0cd..9bf486fb06 100644
--- a/src/nvim/plines.c
+++ b/src/nvim/plines.c
@@ -516,7 +516,7 @@ static int virt_text_cursor_off(const CharsizeArg *csarg, bool on_NUL)
void getvcol(win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *end)
{
char *const line = ml_get_buf(wp->w_buffer, pos->lnum); // start of the line
- int const end_col = pos->col;
+ colnr_T const end_col = pos->col;
CharsizeArg csarg;
bool on_NUL = false;
@@ -560,6 +560,10 @@ void getvcol(win_T *wp, pos_T *pos, colnr_T *start, colnr_T *cursor, colnr_T *en
}
}
+ if (*ci.ptr == NUL && end_col < MAXCOL && end_col > ci.ptr - line) {
+ pos->col = (colnr_T)(ci.ptr - line);
+ }
+
int head = char_size.head;
int incr = char_size.width;