From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 9 Oct 2014 11:36:16 +0000 (+0200)
Subject: updated for version 7.4.468
X-Git-Tag: v7.4.468
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a95bdc52a464df219bd496396632f724bafcfe0;p=vim

updated for version 7.4.468
Problem:    Issue 26: CTRL-C does not interrupt after it was mapped and then
            unmapped.
Solution:   Reset mapped_ctrl_c. (Christian Brabandt)
---

diff --git a/src/getchar.c b/src/getchar.c
index d646dc4c1..9edb767e1 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 5979660f4..83887f67e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    468,
 /**/
     467,
 /**/