patch 7.4.773

Problem:    'langmap' is used in command-line mode when checking for mappings.
            Issue 376.
Solution:   Do not use 'langmap' in command-line mode. (Larry Velazquez)

diff --git a/src/getchar.c b/src/getchar.c
index 54bce315f3135ec6c6b19181f942bd854b8cf6e6..a80432fc5a288dd3738b5b5aa1a6f821d1f47007 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2145,7 +2145,8 @@ vgetorpeek(advance)
                            nolmaplen = 2;
                        else
                        {
-                           LANGMAP_ADJUST(c1, (State & INSERT) == 0);
+                           LANGMAP_ADJUST(c1,
+                                          (State & (CMDLINE | INSERT)) == 0);
                            nolmaplen = 0;
                        }
 #endif

diff --git a/src/testdir/test_mapping.in b/src/testdir/test_mapping.in
index 979184394b42e58b164769d1dd7a4e9e234f6cb5..d6c1b2d5db89ceef19509000cbb14f8e51e52149 100644 (file)
--- a/src/testdir/test_mapping.in
+++ b/src/testdir/test_mapping.in
@@ -28,9 +28,18 @@ GV\ 3
 :inoremap { FAIL_ilangmap
 :set langmap=+{ langnoremap
 o+\e
-: " expr mapping with langmap
+:" Insert-mode expr mapping with langmap
 :inoremap <expr> { "FAIL_iexplangmap"
 o+\e
+:" langmap should not get remapped in Command-line mode
+:cnoremap { FAIL_clangmap
+:call append(line('$'), '+')
+:cunmap {
+:" Command-line mode expr mapping with langmap
+:cnoremap <expr> { "FAIL_cexplangmap"
+:call append(line('$'), '+')
+:cunmap {
+:"
 :" issue #212 (feedkeys insert mapping at current position)
 :nnoremap . :call feedkeys(".", "in")<cr>
 :/^a b

diff --git a/src/testdir/test_mapping.ok b/src/testdir/test_mapping.ok
index 6a88f02de6f7e51c3188055ddf69d5eb1838a3c7..51cc49bf7d44a7b74374d51f032af76a043fe67a 100644 (file)
--- a/src/testdir/test_mapping.ok
+++ b/src/testdir/test_mapping.ok
@@ -8,3 +8,5 @@ TEST2: CTRL-C |<ctrl-c>A|
 vmap works
 +
 +
++
++

diff --git a/src/version.c b/src/version.c
index a43046e9eaa89e4e7b16c0db18b1d3e772d8a65f..8ab862ac411b015e71bf5dc32352fc6920e92889 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 */
+/**/
+    773,
 /**/
     772,
 /**/