vim-patch:7.4.483

Problem:    A 0x80 byte is not handled correctly in abbreviations.
Solution:   Unescape special characters. Add a test. (Christian Brabandt)

https://code.google.com/p/vim/source/detail?r=v7-4-483

3 files changed, 39 insertions, 2 deletions

diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 882d30388c..e9761a7e5d 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -15,6 +15,7 @@
  * mappings and abbreviations
  */
 
+#include <assert.h>
 #include <stdbool.h>
 #include <string.h>
 #include <inttypes.h>
@@ -3572,6 +3573,7 @@ int check_abbr(int c, char_u *ptr, int col, int mincol)
   int clen = 0;                 /* length in characters */
   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;
@@ -3634,12 +3636,23 @@ int check_abbr(int c, char_u *ptr, int col, int mincol)
       mp = mp2;
       mp2 = NULL;
     }
+    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);
+        free(q);
+      }
+    }
     for (; mp;
          mp->m_next == NULL ? (mp = mp2, mp2 = NULL) :
          (mp = mp->m_next)) {
       /* 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/nvim/version.c b/src/nvim/version.c
index 91f160d83f..b2598ada50 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -255,7 +255,7 @@ static int included_patches[] = {
   //486,
   //485,
   //484 NA
-  //483,
+  483,
   //482 NA
   //481 NA
   //480 NA
diff --git a/test/functional/legacy/mapping_spec.lua b/test/functional/legacy/mapping_spec.lua
new file mode 100644
index 0000000000..0cb270f701
--- /dev/null
+++ b/test/functional/legacy/mapping_spec.lua
@@ -0,0 +1,24 @@
+-- Test for mappings and abbreviations
+
+local helpers = require('test.functional.helpers')
+local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local execute, expect = helpers.execute, helpers.expect
+
+describe('mapping', function()
+  setup(clear)
+
+  it('is working', function()
+    insert([[
+      test starts here:
+      ]])
+
+    -- Abbreviations with р (0x80) should work.
+    execute('inoreab чкпр   vim')
+    feed('GAчкпр <cr><esc>')
+
+    -- Assert buffer contents.
+    expect([[
+      test starts here:
+      vim]])
+  end)
+end)