diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-12-23 15:03:08 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-12-23 15:03:08 -0500 |
| commit | 4f6bb8a9a997aacbe9f9f1ca83e7e4c502bdc03c (patch) | |
| tree | 20651663650de0bf7f112c000015622e191268e0 /src/nvim/getchar.c | |
| parent | 44fabac4e0fd5567691d1e7c69da8db156936996 (diff) | |
| parent | 1f73d7cb85a48a650a00b18a7f987954209a4d52 (diff) | |
| download | rneovim-4f6bb8a9a997aacbe9f9f1ca83e7e4c502bdc03c.tar.gz rneovim-4f6bb8a9a997aacbe9f9f1ca83e7e4c502bdc03c.tar.bz2 rneovim-4f6bb8a9a997aacbe9f9f1ca83e7e4c502bdc03c.zip | |
Merge pull request #1727 from fwalch/small-patches
vim-patch: Multiple small patches
Diffstat (limited to 'src/nvim/getchar.c')
| -rw-r--r-- | src/nvim/getchar.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 1d648cb9e9..882d30388c 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -2980,8 +2980,12 @@ do_map ( } if (maptype == 1) { /* delete entry */ - if (!did_it) + 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; + } goto theend; } @@ -3005,7 +3009,7 @@ do_map ( */ mp = xmalloc(sizeof(mapblock_T)); - /* If CTRL-C has been mapped, don't always use it for Interrupting */ + /* If CTRL-C has been mapped, don't always use it for Interrupting. */ if (*keys == Ctrl_C) mapped_ctrl_c = TRUE; |