Mercurial > vim

changeset 6268:4f7f236d773d v7.4.468

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Thu, 09 Oct 2014 13:36:16 +0200
parents 0a59371178f7
children 338b0d7124cc
files src/getchar.c src/version.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
 
--- 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,