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

patch 8.2.1517: cannot easily get the character under the cursor

Browse Source 
Problem:    Cannot easily get the character under the cursor.
Solution:   Add the {chars} argument to strpart().
This commit is contained in:
Bram Moolenaar
2020-08-23 17:34:46 +02:00
parent 430deb1945
commit 6c53fca023
4 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/evalfunc.c
View File

@@ -950,7 +950,7 @@ static funcentry_T global_functions[] =
{"stridx", 2, 3, FEARG_1, ret_number, f_stridx},
{"string", 1, 1, FEARG_1, ret_string, f_string},
{"strlen", 1, 1, FEARG_1, ret_number, f_strlen},
{"strpart", 2, 3, FEARG_1, ret_string, f_strpart},
{"strpart", 2, 4, FEARG_1, ret_string, f_strpart},
{"strptime", 2, 2, FEARG_1, ret_number,
#ifdef HAVE_STRPTIME
f_strptime
@@ -8270,10 +8270,8 @@ f_strpart(typval_T *argvars, typval_T *rettv)
else
len = slen - n; // default len: all bytes that are available.
/*
* Only return the overlap between the specified part and the actual
* string.
*/
// Only return the overlap between the specified part and the actual
// string.
if (n < 0)
{
len += n;
@@ -8286,6 +8284,16 @@ f_strpart(typval_T *argvars, typval_T *rettv)
else if (n + len > slen)
len = slen - n;
if (argvars[2].v_type != VAR_UNKNOWN && argvars[3].v_type != VAR_UNKNOWN)
{
int off;
// length in characters
for (off = n; off < slen && len > 0; --len)
off += mb_ptr2len(p + off);
len = off - n;
}
rettv->v_type = VAR_STRING;
rettv->vval.v_string = vim_strnsave(p + n, len);
}