updated for version 7.4.552

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

diff --git a/src/getchar.c b/src/getchar.c
index c9ee4d05106ffd9e6b16b5ae69461bb8a5d470ee..174cfa892fde49e9f375973cef72b03df44d68cf 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2145,7 +2145,7 @@ vgetorpeek(advance)
                            nolmaplen = 2;
                        else
                        {
-                           LANGMAP_ADJUST(c1, TRUE);
+                           LANGMAP_ADJUST(c1, (State & INSERT) == 0);
                            nolmaplen = 0;
                        }
 #endif

diff --git a/src/testdir/test_mapping.in b/src/testdir/test_mapping.in
index e2572772c1d9d5dcaabe2cf9d0185bcd1b010edc..5f895a46f2179bfa547a7b0cab15499e316e0566 100644 (file)
--- a/src/testdir/test_mapping.in
+++ b/src/testdir/test_mapping.in
@@ -8,6 +8,15 @@ STARTTEST
 :inoreab чкпр   vim
 GAчкпр 
 \e
+
+: " langmap should not get remapped in insert mode
+:inoremap { FAIL_ilangmap
+:set langmap=+{ langnoremap
+o+\e
+: " expr mapping with langmap
+:inoremap <expr> { "FAIL_iexplangmap"
+o+\e
+
 :/^test/,$w! test.out
 :qa!
 ENDTEST

diff --git a/src/testdir/test_mapping.ok b/src/testdir/test_mapping.ok
index abdaea6a36928f6c9ea1be7e280cd6ce3d9f8646..8d949765827ecff87fd87677e5cc39a19a6cebff 100644 (file)
--- a/src/testdir/test_mapping.ok
+++ b/src/testdir/test_mapping.ok
@@ -1,2 +1,4 @@
 test starts here:
 vim
++
++

diff --git a/src/version.c b/src/version.c
index 6408d570770755bccca0721a61786844f65d4355..e8d75252facca3dfe1c8ccf4e0995740762e9d56 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 */
+/**/
+    552,
 /**/
     551,
 /**/