From c94c1467b9b86156a6b7c8d3e41ff01c13d2be07 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 22 May 2020 20:01:06 +0200 Subject: patch 8.2.0812: mapset() does not properly handle <> notation Problem: mapset() does not properly handle <> notation. Solution: Convert <> codes. (closes #6116) --- src/map.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/map.c') diff --git a/src/map.c b/src/map.c index 6f926852d..4a9849d33 100644 --- a/src/map.c +++ b/src/map.c @@ -2269,6 +2269,8 @@ f_mapset(typval_T *argvars, typval_T *rettv UNUSED) dict_T *d; char_u *lhs; char_u *rhs; + char_u *orig_rhs; + char_u *arg_buf = NULL; int noremap; int expr; int silent; @@ -2304,6 +2306,9 @@ f_mapset(typval_T *argvars, typval_T *rettv UNUSED) emsg(_("E99: rhs entry missing in mapset() dict argument")); return; } + orig_rhs = rhs; + rhs = replace_termcodes(rhs, &arg_buf, + REPTERM_DO_LT | REPTERM_SPECIAL, NULL); noremap = dict_get_number(d, (char_u *)"noremap") ? REMAP_NONE: 0; if (dict_get_number(d, (char_u *)"script") != 0) @@ -2330,9 +2335,10 @@ f_mapset(typval_T *argvars, typval_T *rettv UNUSED) keys = replace_termcodes(lhs, &keys_buf, REPTERM_FROM_PART | REPTERM_DO_LT, NULL); - (void)map_add(map_table, abbr_table, keys, rhs, rhs, noremap, + (void)map_add(map_table, abbr_table, keys, rhs, orig_rhs, noremap, nowait, silent, mode, is_abbr, expr, sid, lnum, simplified); vim_free(keys_buf); + vim_free(arg_buf); } #endif -- cgit v1.2.1