thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2342: "char" functions may return wrong column in Insert mode

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2021-01-13 20:08:38 +01:00
parent 1bb4de5302
commit 9145846b6a
4 changed files with 91 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/evalfunc.c
View File

@@ -2748,7 +2748,7 @@ set_cursorpos(typval_T *argvars, typval_T *rettv, int charcol)
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 @@ getpos_both(
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;
}
}