updated for version 7.4.483
Problem: A 0x80 byte is not handled correctly in abbreviations.
Solution: Unescape special characters. Add a test. (Christian Brabandt)
diff --git a/src/getchar.c b/src/getchar.c
index 9edb767..cc93a7d 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -4443,6 +4443,7 @@
#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 @@
#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 @@
{
/* 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;
}