Merge pull request #1742 from fwalch/vim-7.4.552

vim-patch:7.4.552

src/nvim/getchar.c

@@ -1775,7 +1775,7 @@ static int vgetorpeek(int advance)
             if (c1 == K_SPECIAL)
               nolmaplen = 2;
             else {
-              LANGMAP_ADJUST(c1, TRUE);
+              LANGMAP_ADJUST(c1, (State & INSERT) == 0);
               nolmaplen = 0;
             }
             /* First try buffer-local mappings. */

src/nvim/version.c

@@ -186,7 +186,7 @@ static int included_patches[] = {
   //555 NA
   //554,
   //553,
-  //552,
+  552,
   //551,
   //550,
   549,

test/functional/legacy/mapping_spec.lua

@@ -18,9 +18,20 @@ describe('mapping', function()
     execute('inoreab чкпр   vim')
     feed('GAчкпр <cr><esc>')
 
+    -- langmap should not get remapped in insert mode.
+    execute('inoremap { FAIL_ilangmap')
+    execute('set langmap=+{ langnoremap')
+    feed('o+<esc>')
+
+    -- expr mapping with langmap.
+    execute('inoremap <expr> { "FAIL_iexplangmap"')
+    feed('o+<esc>')
+
     -- Assert buffer contents.
     expect([[
       test starts here:
-      vim]])
+      vim
+      +
+      +]])
   end)
 end)