diff options
| -rw-r--r-- | src/getchar.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_gui.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/getchar.c b/src/getchar.c index ace56863e..fcfad9dc0 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2355,7 +2355,8 @@ handle_mapping( // Skip ":lmap" mappings if keys were mapped. if (mp->m_keys[0] == tb_c1 && (mp->m_mode & local_State) - && !(mp->m_simplified && seenModifyOtherKeys) + && !(mp->m_simplified && seenModifyOtherKeys + && typebuf.tb_maplen == 0) && ((mp->m_mode & LANGMAP) == 0 || typebuf.tb_maplen == 0)) { #ifdef FEAT_LANGMAP diff --git a/src/testdir/test_gui.vim b/src/testdir/test_gui.vim index c9e3f7f13..808ba5d8b 100644 --- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -856,4 +856,14 @@ func Test_gui_run_cmd_in_terminal() let &guioptions = save_guioptions endfunc +func Test_gui_recursive_mapping() + nmap ' <C-W> + nmap <C-W>a :let didit = 1<CR> + call feedkeys("'a", 'xt') + call assert_equal(1, didit) + + nunmap ' + nunmap <C-W>a +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 399886e34..3d24837e2 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 904, +/**/ 903, /**/ 902, |