aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/getchar.c8
-rw-r--r--src/nvim/version.c2
2 files changed, 7 insertions, 3 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;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index cd11dfe1d0..dade047d0a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -270,7 +270,7 @@ static int included_patches[] = {
//471 NA
470,
//469 NA
- //468,
+ 468,
467,
//465 NA
//464 NA