From e27460b60cb3d725ecfe8ba34438642fdb174280 Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Fri, 26 Dec 2014 16:49:44 +0100
Subject: vim-patch:7.4.552

Problem:    Langmap applies to Insert mode expression mappings.
Solution:   Check for Insert mode. (Daniel Hahler)

https://code.google.com/p/vim/source/detail?r=v7-4-552
---
 src/nvim/getchar.c | 2 +-
 src/nvim/version.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index d0eebf8fea..e12601e4c9 100644
--- a/src/nvim/getchar.c
+++ b/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. */
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 7eb528f91c..fe6f4b1635 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -186,7 +186,7 @@ static int included_patches[] = {
   //555 NA
   //554,
   //553,
-  //552,
+  552,
   //551,
   //550,
   //549,
-- 
cgit