vim-patch: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)

https://code.google.com/p/vim/source/detail?r=v7-4-468
This commit is contained in:
Florian Walch 2014-12-23 12:18:46 +01:00
parent c3de63bfbc
commit 0158539c77
2 changed files with 7 additions and 3 deletions

View File

@ -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;

View File

@ -270,7 +270,7 @@ static int included_patches[] = {
//471 NA
470,
//469 NA
//468,
468,
467,
//465 NA
//464 NA