diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-09-26 15:34:17 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-09-30 21:00:17 -0400 |
| commit | 2a57dce9f2ea157a6f9b15613788cdd8cebc26e5 (patch) | |
| tree | 74fb8a6dba09c1dc4e4bdc41fc7e3da4bada6bee /src/nvim/regexp.c | |
| parent | 4edf7b9ff22ca702876a7d0b5534fa2fc16b1897 (diff) | |
| download | rneovim-2a57dce9f2ea157a6f9b15613788cdd8cebc26e5.tar.gz rneovim-2a57dce9f2ea157a6f9b15613788cdd8cebc26e5.tar.bz2 rneovim-2a57dce9f2ea157a6f9b15613788cdd8cebc26e5.zip | |
vim-patch:8.1.1319: computing function length name in many places
Problem: Computing function length name in many places.
Solution: compute name length in call_func().
https://github.com/vim/vim/commit/6ed8819822994512c160006bd1204aa11ae3c494
In call_func(), reassign "len" param to (int)STRLEN(funcname)
instead of using vim_strsave() which runs strlen().
"len" param is checked for v:lua functions.
call_func() states that strlen() is used if "len" is set to -1.
Diffstat (limited to 'src/nvim/regexp.c')
| -rw-r--r-- | src/nvim/regexp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index a570328499..6316129c6a 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -6708,14 +6708,14 @@ static int vim_regsub_both(char_u *source, typval_T *expr, char_u *dest, argv[0].vval.v_list = &matchList.sl_list; if (expr->v_type == VAR_FUNC) { s = expr->vval.v_string; - call_func(s, (int)STRLEN(s), &rettv, 1, argv, + call_func(s, -1, &rettv, 1, argv, fill_submatch_list, 0L, 0L, &dummy, true, NULL, NULL); } else if (expr->v_type == VAR_PARTIAL) { partial_T *partial = expr->vval.v_partial; s = partial_name(partial); - call_func(s, (int)STRLEN(s), &rettv, 1, argv, + call_func(s, -1, &rettv, 1, argv, fill_submatch_list, 0L, 0L, &dummy, true, partial, NULL); } |