diff options
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); |