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 9edb767e1b302e21533537c0cb9144aa217416db..cc93a7dd815b979925a4ff9da4f47d1c24e3cb38 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -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;
        }

diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index 5012812448ede6d8bf790386f59bc29f76d0615c..c0df2c1b56229103b0db7f2e4b03c4a321394ede 100644 (file)
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -43,6 +43,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                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 38264f2eaf900a347f590ed2f5a2b2ee02474f78..91500439fda156abc9e999791d793d42314c5fb3 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -42,6 +42,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                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 782f89d6467d8e67e539810524830a799b5273c0..247c0f259d253b658fbd2f6fa77c288fcbe04474 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -62,6 +62,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                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 d3e833793a07d5a06d723aed059ece9fb87066f1..cfade3f7f7d6b2b15bafbd713982b61f9a9230a3 100644 (file)
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -44,6 +44,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                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 3c7afc346d6247fb22d0e680161e85c891192a0d..6483b7ce3ab00e1638d48d6e7919c03fd9b2c5c2 100644 (file)
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -103,6 +103,7 @@ SCRIPT = test1.out  test2.out  test3.out  test4.out  test5.out  \
         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 59fe0116961e0ec74d5ca0c0f6c6d79f2608ba35..41f25cfbd14298546e38284bbc9025308a5936e4 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -40,6 +40,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
                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 (file)
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чкпр 
+\e
+:/^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 (file)
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 7540f8ddc470482c8afba8f64354af454f9f7c44..7d1a1914b6f57c73f824afb4b69324bd2e6ebedc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    483,
 /**/
     482,
 /**/