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 | 9a95bdc52a464df219bd496396632f724bafcfe0 (patch) | |
| tree | 6bf81a025db6f0b53c0107672c9aa11ceadc6eb0 | |
| parent | 404406ad6ba4192262caa54cf5d90b664349aa28 (diff) | |
| download | vim-git-9a95bdc52a464df219bd496396632f724bafcfe0.tar.gz | |
updated for version 7.4.468v7.4.468
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 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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 468, +/**/ 467, /**/ 466, |