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

patch 8.2.4867: listing of mapping with K_SPECIAL is wrong

Browse Source 
Problem:    Listing of mapping with K_SPECIAL is wrong.
Solution:   Adjust escaping of special characters. (closes #10351)
This commit is contained in:
zeertzjq
2022-05-04 18:51:43 +01:00
committed by Bram Moolenaar
parent 47d4e317f8
commit ac402f4d64
4 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/map.c
View File

@@ -189,17 +189,7 @@ showmap(
if (*mp->m_str == NUL)
msg_puts_attr("<Nop>", HL_ATTR(HLF_8));
else
{
// Remove escaping of CSI, because "m_str" is in a format to be used
// as typeahead.
char_u *s = vim_strsave(mp->m_str);
if (s != NULL)
{
vim_unescape_csi(s);
msg_outtrans_special(s, FALSE, 0);
vim_free(s);
}
}
msg_outtrans_special(mp->m_str, FALSE, 0);
#ifdef FEAT_EVAL
if (p_verbose > 0)
last_set_msg(mp->m_script_ctx);

26
src/message.c
View File

@@ -1800,19 +1800,29 @@ str2special(
if (has_mbyte && !IS_SPECIAL(c))
{
int len = (*mb_ptr2len)(str);
char_u *p;
// For multi-byte characters check for an illegal byte.
if (MB_BYTE2LEN(*str) > len)
*sp = str;
// Try to un-escape a multi-byte character after modifiers.
p = mb_unescape(sp);
if (p == NULL)
{
transchar_nonprint(curbuf, buf, c);
*sp = str + 1;
return buf;
int len = (*mb_ptr2len)(str);
// Check for an illegal byte.
if (MB_BYTE2LEN(*str) > len)
{
transchar_nonprint(curbuf, buf, c);
*sp = str + 1;
return buf;
}
*sp = str + len;
p = str;
}
// Since 'special' is TRUE the multi-byte character 'c' will be
// processed by get_special_key_name()
c = (*mb_ptr2char)(str);
*sp = str + len;
c = (*mb_ptr2char)(p);
}
else
*sp = str + 1;

20
src/testdir/test_mapping.vim
View File

@@ -482,6 +482,26 @@ func Test_list_mappings()
call assert_match("\tLast set from .*/test_mapping.vim line \\d\\+$",
\ execute('verbose map ,n')->trim()->split("\n")[1])
" character with K_SPECIAL byte in rhs
nmap foo …
call assert_equal(['n foo …'],
\ execute('nmap foo')->trim()->split("\n"))
" modified character with K_SPECIAL byte in rhs
nmap foo <M-…>
call assert_equal(['n foo <M-…>'],
\ execute('nmap foo')->trim()->split("\n"))
" character with K_SPECIAL byte in lhs
nmap … foo
call assert_equal(['n … foo'],
\ execute('nmap …')->trim()->split("\n"))
" modified character with K_SPECIAL byte in lhs
nmap <M-…> foo
call assert_equal(['n <M-…> foo'],
\ execute('nmap <M-…>')->trim()->split("\n"))
" map to CTRL-V
exe "nmap ,k \<C-V>"
call assert_equal(['n ,k <Nop>'],

2
src/version.c
View File

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