thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.483

Browse Source 
Problem:    A 0x80 byte is not handled correctly in abbreviations.
Solution:   Unescape special characters. Add a test. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2014-10-21 16:22:17 +02:00
parent f1b4622366
commit bdef518b0a
10 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/getchar.c
View File

@@ -4443,6 +4443,7 @@ check_abbr(c, ptr, col, mincol)
#endif
int is_id = TRUE;
int vim_abbr;
int qlen; /* length of q, CSI/K_SPECIAL unescaped */
if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */
return FALSE;
@@ -4520,6 +4521,19 @@ check_abbr(c, ptr, col, mincol)
#else
mp = first_abbr;
#endif
qlen = mp->m_keylen;
if (vim_strbyte(mp->m_keys, K_SPECIAL) != NULL)
{
char_u *q = vim_strsave(mp->m_keys);
/* might have CSI escaped mp->m_keys */
if (q != NULL)
{
vim_unescape_csi(q);
qlen = STRLEN(q);
vim_free(q);
}
}
for ( ; mp;
#ifdef FEAT_LOCALMAP
mp->m_next == NULL ? (mp = mp2, mp2 = NULL) :
@@ -4528,7 +4542,7 @@ check_abbr(c, ptr, col, mincol)
{
/* find entries with right mode and keys */
if ( (mp->m_mode & State)
&& mp->m_keylen == len
&& qlen == len
&& !STRNCMP(mp->m_keys, ptr, (size_t)len))
break;
}