patch 8.2.2342: "char" functions may return wrong column in Insert mode
Problem: "char" functions return the wront column in Insert mode when the
cursor is beyond the end of the line.
Solution: Compute the column correctly. (Yegappan Lakshmanan, closes #7669)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index d3ef15e..59fa2b1 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -2748,7 +2748,7 @@
semsg(_(e_invarg2), tv_get_string(&argvars[0]));
col = (long)tv_get_number_chk(&argvars[1], NULL);
if (charcol)
- col = buf_charidx_to_byteidx(curbuf, line, col);
+ col = buf_charidx_to_byteidx(curbuf, line, col) + 1;
if (argvars[2].v_type != VAR_UNKNOWN)
coladd = (long)tv_get_number_chk(&argvars[2], NULL);
}
@@ -4011,8 +4011,8 @@
if (fp != NULL && charcol)
{
pos = *fp;
- pos.col = buf_byteidx_to_charidx(wp->w_buffer, pos.lnum,
- pos.col) - 1;
+ pos.col =
+ buf_byteidx_to_charidx(wp->w_buffer, pos.lnum, pos.col);
fp = &pos;
}
}