aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 8.1.1254: mapping completion contains dead code

Browse Source 
Problem:    Mapping completion contains dead code.
Solution:   Remove the code.
This commit is contained in:
Bram Moolenaar
2019-05-03 21:10:36 +02:00
parent 92b9e60cb5
commit 61df0c7996
3 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/term.c
View File

@@ -6649,7 +6649,6 @@ translate_mapping(char_u *str)
int modifiers; int modifiers;
int cpo_bslash; int cpo_bslash;
int cpo_special; int cpo_special;
int cpo_keycode;
ga_init(&ga); ga_init(&ga);
ga.ga_itemsize = 1; ga.ga_itemsize = 1;
@@ -6657,7 +6656,6 @@ translate_mapping(char_u *str)
cpo_bslash = (vim_strchr(p_cpo, CPO_BSLASH) != NULL); cpo_bslash = (vim_strchr(p_cpo, CPO_BSLASH) != NULL);
cpo_special = (vim_strchr(p_cpo, CPO_SPECI) != NULL); cpo_special = (vim_strchr(p_cpo, CPO_SPECI) != NULL);
cpo_keycode = (vim_strchr(p_cpo, CPO_KEYCODE) == NULL);
for (; *str; ++str) for (; *str; ++str)
{ {
@@ -6671,22 +6669,6 @@ translate_mapping(char_u *str)
modifiers = *++str; modifiers = *++str;
c = *++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 (c == K_SPECIAL && str[1] != NUL && str[2] != NUL)
{ {
if (cpo_special) if (cpo_special)

5
src/testdir/test_cmdline.vim
View File

@@ -107,9 +107,14 @@ func Test_map_completion()
set cpo+=< set cpo+=<
map <Left> left 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 feedkeys(":map <L\<Tab>\<Home>\"\<CR>", 'xt')
call assert_equal('"map <Left>', getreg(':')) call assert_equal('"map <Left>', getreg(':'))
call feedkeys(":map \<Esc>[17~\<Tab>\<Home>\"\<CR>", 'xt')
call assert_equal("\"map <F6>x", getreg(':'))
unmap <Left> unmap <Left>
call feedkeys(":unmap \<Esc>[17~x\<CR>", 'xt')
set cpo-=< set cpo-=<
set cpo+=B set cpo+=B

2
src/version.c
View File

@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1254,
/**/ /**/
1253, 1253,
/**/ /**/