Mercurial > vim
changeset 20516:d9e3fdf26cb9 v8.2.0812
patch 8.2.0812: mapset() does not properly handle <> notation
Commit: https://github.com/vim/vim/commit/c94c1467b9b86156a6b7c8d3e41ff01c13d2be07
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri May 22 20:01:06 2020 +0200
patch 8.2.0812: mapset() does not properly handle <> notation
Problem: mapset() does not properly handle <> notation.
Solution: Convert <> codes. (closes https://github.com/vim/vim/issues/6116)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 22 May 2020 20:15:03 +0200 |
| parents | 313bff7c3f01 |
| children | a7c6cd0d7ba0 |
| files | src/map.c src/testdir/test_maparg.vim src/version.c |
| diffstat | 3 files changed, 77 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/map.c +++ b/src/map.c @@ -2269,6 +2269,8 @@ f_mapset(typval_T *argvars, typval_T *re 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 *re 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 *re 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
--- a/src/testdir/test_maparg.vim +++ b/src/testdir/test_maparg.vim @@ -6,7 +6,7 @@ func s:SID() return str2nr(matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze_SID$')) endfunc -funct Test_maparg() +func Test_maparg() new set cpo-=< set encoding=utf8 @@ -156,6 +156,73 @@ endfunc func Test_mapset() call One_mapset_test('K') call One_mapset_test('<F3>') + + " Check <> key conversion + new + inoremap K one<Left>x + call feedkeys("iK\<Esc>", 'xt') + call assert_equal('onxe', getline(1)) + + let orig = maparg('K', 'i', 0, 1) + call assert_equal('K', orig.lhs) + call assert_equal('one<Left>x', orig.rhs) + call assert_equal('i', orig.mode) + + iunmap K + let d = maparg('K', 'i', 0, 1) + call assert_equal({}, d) + + call mapset('i', 0, orig) + call feedkeys("SK\<Esc>", 'xt') + call assert_equal('onxe', getline(1)) + + iunmap K + + " Test literal <CR> using a backslash + let cpo_save = &cpo + set cpo-=B + inoremap K one\<CR>two + call feedkeys("SK\<Esc>", 'xt') + call assert_equal('one<CR>two', getline(1)) + + let orig = maparg('K', 'i', 0, 1) + call assert_equal('K', orig.lhs) + call assert_equal('one\<CR>two', orig.rhs) + call assert_equal('i', orig.mode) + + iunmap K + let d = maparg('K', 'i', 0, 1) + call assert_equal({}, d) + + call mapset('i', 0, orig) + call feedkeys("SK\<Esc>", 'xt') + call assert_equal('one<CR>two', getline(1)) + + iunmap K + let &cpo = cpo_save + + " Test literal <CR> using CTRL-V + inoremap K one<CR>two + call feedkeys("SK\<Esc>", 'xt') + call assert_equal('one<CR>two', getline(1)) + + let orig = maparg('K', 'i', 0, 1) + call assert_equal('K', orig.lhs) + call assert_equal("one\x16<CR>two", orig.rhs) + call assert_equal('i', orig.mode) + + iunmap K + let d = maparg('K', 'i', 0, 1) + call assert_equal({}, d) + + call mapset('i', 0, orig) + call feedkeys("SK\<Esc>", 'xt') + call assert_equal('one<CR>two', getline(1)) + + iunmap K + let &cpo = cpo_save + + bwipe! endfunc " vim: shiftwidth=2 sts=2 expandtab