vim-patch:8.2.0812: mapset() does not properly handle <> notation

Problem:    mapset() does not properly handle <> notation.
Solution:   Convert <> codes. (closes vim/vim#6116)
c94c1467b9
This commit is contained in:
zeertzjq
2022-08-01 14:00:57 +08:00
parent 083865071b
commit 5c72640bc2
2 changed files with 73 additions and 3 deletions

View File

@@ -2150,6 +2150,9 @@ void f_mapset(typval_T *argvars, typval_T *rettv, FunPtr fptr)
emsg(_("E99: rhs entry missing in mapset() dict argument"));
return;
}
char *orig_rhs = rhs;
char *arg_buf = NULL;
rhs = replace_termcodes(rhs, STRLEN(rhs), &arg_buf, REPTERM_DO_LT, NULL, CPO_TO_CPO_FLAGS);
int noremap = tv_dict_get_number(d, "noremap") ? REMAP_NONE : 0;
if (tv_dict_get_number(d, "script") != 0) {
@@ -2158,9 +2161,9 @@ void f_mapset(typval_T *argvars, typval_T *rettv, FunPtr fptr)
// TODO: support "callback" and "desc"
MapArguments args = {
.rhs = vim_strsave((char_u *)rhs),
.rhs = (char_u *)rhs,
.rhs_lua = LUA_NOREF,
.orig_rhs = vim_strsave((char_u *)rhs),
.orig_rhs = vim_strsave((char_u *)orig_rhs),
.expr = tv_dict_get_number(d, "expr") != 0,
.silent = tv_dict_get_number(d, "silent") != 0,
.nowait = tv_dict_get_number(d, "nowait") != 0,