From 0158539c77eec5cba2622bb929e32c84646866dc Mon Sep 17 00:00:00 2001 From: Florian Walch Date: Tue, 23 Dec 2014 12:18:46 +0100 Subject: 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 --- src/nvim/getchar.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/nvim/getchar.c') diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 1d648cb9e9..882d30388c 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -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; -- cgit