Mercurial > vim
changeset 16501:5273b506b050 v8.1.1254
patch 8.1.1254: mapping completion contains dead code
commit https://github.com/vim/vim/commit/61df0c7996d9acc94267735abc214cb176e63ede
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri May 3 21:10:36 2019 +0200
patch 8.1.1254: mapping completion contains dead code
Problem: Mapping completion contains dead code.
Solution: Remove the code.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Fri, 03 May 2019 21:15:05 +0200 |
parents | 3b619b3452f1 |
children | 1a046ff2f5fb |
files | src/term.c src/testdir/test_cmdline.vim src/version.c |
diffstat | 3 files changed, 7 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/term.c +++ b/src/term.c @@ -6649,7 +6649,6 @@ translate_mapping(char_u *str) int modifiers; int cpo_bslash; int cpo_special; - int cpo_keycode; ga_init(&ga); ga.ga_itemsize = 1; @@ -6657,7 +6656,6 @@ translate_mapping(char_u *str) cpo_bslash = (vim_strchr(p_cpo, CPO_BSLASH) != NULL); cpo_special = (vim_strchr(p_cpo, CPO_SPECI) != NULL); - cpo_keycode = (vim_strchr(p_cpo, CPO_KEYCODE) == NULL); for (; *str; ++str) { @@ -6671,22 +6669,6 @@ translate_mapping(char_u *str) modifiers = *++str; c = *++str; } - if (cpo_special && cpo_keycode && c == K_SPECIAL && !modifiers) - { - int i; - - /* try to find special key in termcodes */ - for (i = 0; i < tc_len; ++i) - if (termcodes[i].name[0] == str[1] - && termcodes[i].name[1] == str[2]) - break; - if (i < tc_len) - { - ga_concat(&ga, termcodes[i].code); - str += 2; - continue; /* for (str) */ - } - } if (c == K_SPECIAL && str[1] != NUL && str[2] != NUL) { if (cpo_special)
--- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -107,9 +107,14 @@ func Test_map_completion() set cpo+=< map <Left> left + exe "set t_k6=\<Esc>[17~" + call feedkeys(":map \<Esc>[17~x f6x\<CR>", 'xt') call feedkeys(":map <L\<Tab>\<Home>\"\<CR>", 'xt') call assert_equal('"map <Left>', getreg(':')) + call feedkeys(":map \<Esc>[17~\<Tab>\<Home>\"\<CR>", 'xt') + call assert_equal("\"map <F6>x", getreg(':')) unmap <Left> + call feedkeys(":unmap \<Esc>[17~x\<CR>", 'xt') set cpo-=< set cpo+=B