summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/getchar.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/getchar.c b/src/getchar.c
index 3ae5f4060..54bce315f 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -3710,9 +3710,11 @@ do_map(maptype, arg, mode, abbrev)
else if (*keys == Ctrl_C)
{
/* If CTRL-C has been unmapped, reuse it for Interrupting. */
+#ifdef FEAT_LOCALMAP
if (map_table == curbuf->b_maphash)
curbuf->b_mapped_ctrl_c &= ~mode;
else
+#endif
mapped_ctrl_c &= ~mode;
}
goto theend;
@@ -3750,9 +3752,11 @@ do_map(maptype, arg, mode, abbrev)
/* If CTRL-C has been mapped, don't always use it for Interrupting. */
if (*keys == Ctrl_C)
{
+#ifdef FEAT_LOCALMAP
if (map_table == curbuf->b_maphash)
curbuf->b_mapped_ctrl_c |= mode;
else
+#endif
mapped_ctrl_c |= mode;
}
diff --git a/src/version.c b/src/version.c
index b6e75563a..39191f500 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 */
/**/
+ 571,
+/**/
570,
/**/
569,