diff options
| author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2015-12-19 10:03:17 +0900 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-13 01:56:36 -0500 |
| commit | 3dfbeabf35dbfe5494a4adce7b4d94d56bbe0171 (patch) | |
| tree | f3b6f3c95a1e1b20545798e94a88d774bca8b1ea /src/nvim/getchar.c | |
| parent | 420fe1fe73153cc7407a770fc2d6ee85ff490bff (diff) | |
| download | rneovim-3dfbeabf35dbfe5494a4adce7b4d94d56bbe0171.tar.gz rneovim-3dfbeabf35dbfe5494a4adce7b4d94d56bbe0171.tar.bz2 rneovim-3dfbeabf35dbfe5494a4adce7b4d94d56bbe0171.zip | |
vim-patch:7.4.569/573
vim-patch:7.4.569
vim-patch:7.4.573
Helped-by: @glts https://github.com/neovim/neovim/pull/2621
Problem: Having CTRL-C interrupt or not does not check the mode of the
mapping. (Ingo Karkat)
Solution: Use a bitmask with the map mode. (Christian Brabandt)
https://github.com/vim/vim/commit/651863c94a882a97aec7968fc87a638ff78e56ff
Problem: Mapping CTRL-C in Visual mode doesn't work. (Ingo Karkat)
Solution: Call get_real_state() instead of using State directly.
https://github.com/vim/vim/commit/5000869712f799d9ca25c0e45dc21d332edae5f4
Diffstat (limited to 'src/nvim/getchar.c')
| -rw-r--r-- | src/nvim/getchar.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 44d6c086e7..008c6cecd5 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -2941,7 +2941,10 @@ do_map ( retval = 2; /* no match */ } else if (*keys == Ctrl_C) { /* If CTRL-C has been unmapped, reuse it for Interrupting. */ - mapped_ctrl_c = FALSE; + if (map_table == curbuf->b_maphash) + curbuf->b_mapped_ctrl_c &= ~mode; + else + mapped_ctrl_c &= ~mode; } goto theend; } @@ -2966,9 +2969,13 @@ do_map ( */ mp = xmalloc(sizeof(mapblock_T)); - /* If CTRL-C has been mapped, don't always use it for Interrupting. */ - if (*keys == Ctrl_C) - mapped_ctrl_c = TRUE; + // If CTRL-C has been mapped, don't always use it for Interrupting. + if (*keys == Ctrl_C) { + if (map_table == curbuf->b_maphash) + curbuf->b_mapped_ctrl_c |= mode; + else + mapped_ctrl_c |= mode; + } mp->m_keys = vim_strsave(keys); mp->m_str = vim_strsave(rhs); |