diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-01-13 03:27:23 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-13 03:27:23 -0500 |
| commit | 7f3999ac806daefa078b4db0781bfc1e190e135e (patch) | |
| tree | 6386cdb6bf191873fc6ea1593a713e145810165a /src/nvim/getchar.c | |
| parent | 5c87d40acdd02286baf492067031c93d93b7d389 (diff) | |
| parent | 8eeda7169aa47881f0b6d697e291a1ef85c43e4e (diff) | |
| download | rneovim-7f3999ac806daefa078b4db0781bfc1e190e135e.tar.gz rneovim-7f3999ac806daefa078b4db0781bfc1e190e135e.tar.bz2 rneovim-7f3999ac806daefa078b4db0781bfc1e190e135e.zip | |
Merge pull request #3996 from justinmk/ctrlc
vim-patch:7.4.569, 7.4.573
Diffstat (limited to 'src/nvim/getchar.c')
| -rw-r--r-- | src/nvim/getchar.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 44d6c086e7..89d22ad811 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -2940,8 +2940,12 @@ do_map ( if (!did_it) { retval = 2; /* no match */ } else if (*keys == Ctrl_C) { - /* If CTRL-C has been unmapped, reuse it for Interrupting. */ - mapped_ctrl_c = FALSE; + // If CTRL-C has been unmapped, reuse it for Interrupting. + if (map_table == curbuf->b_maphash) { + curbuf->b_mapped_ctrl_c &= ~mode; + } else { + mapped_ctrl_c &= ~mode; + } } goto theend; } @@ -2966,9 +2970,14 @@ 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); |