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;
}
diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index 5012812..c0df2c1 100644
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -43,6 +43,7 @@
test_insertcount.out \
test_listlbr.out \
test_listlbr_utf8.out \
+ test_mapping.out \
test_options.out \
test_qf_title.out \
test_utf8.out
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 38264f2..9150043 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -42,6 +42,7 @@
test_insertcount.out \
test_listlbr.out \
test_listlbr_utf8.out \
+ test_mapping.out \
test_options.out \
test_qf_title.out \
test_utf8.out
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 782f89d..247c0f2 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -62,6 +62,7 @@
test_insertcount.out \
test_listlbr.out \
test_listlbr_utf8.out \
+ test_mapping.out \
test_options.out \
test_qf_title.out \
test_utf8.out
diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index d3e8337..cfade3f 100644
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -44,6 +44,7 @@
test_insertcount.out \
test_listlbr.out \
test_listlbr_utf8.out \
+ test_mapping.out \
test_options.out \
test_qf_title.out \
test_utf8.out
diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 3c7afc3..6483b7c 100644
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -103,6 +103,7 @@
test_insertcount.out \
test_listlbr.out \
test_listlbr_utf8.out \
+ test_mapping.out \
test_options.out \
test_qf_title.out \
test_utf8.out
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 59fe011..41f25cf 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -40,6 +40,7 @@
test_insertcount.out \
test_listlbr.out \
test_listlbr_utf8.out \
+ test_mapping.out \
test_options.out \
test_qf_title.out \
test_utf8.out
diff --git a/src/testdir/test_mapping.in b/src/testdir/test_mapping.in
new file mode 100644
index 0000000..55dac09
--- /dev/null
+++ b/src/testdir/test_mapping.in
@@ -0,0 +1,15 @@
+Test for mappings and abbreviations
+
+STARTTEST
+:so small.vim
+:so mbyte.vim
+: " abbreviations with р (0x80) should work
+:inoreab чкпр vim
+GAчкпр
+
+:/^test/,$w! test.out
+:qa!
+ENDTEST
+
+test starts here:
+
diff --git a/src/testdir/test_mapping.ok b/src/testdir/test_mapping.ok
new file mode 100644
index 0000000..abdaea6
--- /dev/null
+++ b/src/testdir/test_mapping.ok
@@ -0,0 +1,2 @@
+test starts here:
+vim
diff --git a/src/version.c b/src/version.c
index 7540f8d..7d1a191 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 483,
+/**/
482,
/**/
481,