diff options
| author | Bram Moolenaar <bram@vim.org> | 2014-10-09 13:36:16 +0200 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2014-10-09 13:36:16 +0200 |
| commit | 201b65b847fdc9592d9e6d0a60521cd59c4bbd71 (patch) | |
| tree | ce9ded97627755167b71b27b590dd661c6092852 | |
| parent | 9fb044b85db8e3b78efd921656ce7f1d24de4c2f (diff) | |
| download | vim-201b65b847fdc9592d9e6d0a60521cd59c4bbd71.tar.gz | |
Problem: Issue 26: CTRL-C does not interrupt after it was mapped and then
unmapped.
Solution: Reset mapped_ctrl_c. (Christian Brabandt)
| -rw-r--r-- | src/getchar.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
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, |