summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/getchar.c5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/getchar.c b/src/getchar.c
index d646dc4c..9edb767e 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3707,6 +3707,9 @@ do_map(maptype, arg, mode, abbrev)
{
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;
}
@@ -3739,7 +3742,7 @@ do_map(maptype, arg, mode, abbrev)
goto theend;
}
- /* 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/version.c b/src/version.c
index 5979660f..83887f67 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 468,
+/**/
467,
/**/
466,