summaryrefslogtreecommitdiff
path: root/src/ui.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-01-14 12:44:41 +0100
committerBram Moolenaar <Bram@vim.org>2015-01-14 12:44:41 +0100
commit651863c94a882a97aec7968fc87a638ff78e56ff (patch)
tree8b7e256d3ed933795b4442f140930734a414863e /src/ui.c
parent8be6388b7649d9378cd1ba1627a4b0aed61b86e7 (diff)
downloadvim-git-651863c94a882a97aec7968fc87a638ff78e56ff.tar.gz
updated for version 7.4.569v7.4.569
Problem: Having CTRL-C interrupt or not does not check the mode of the mapping. (Ingo Karkat) Solution: Use a bitmask with the map mode. (Christian Brabandt)
Diffstat (limited to 'src/ui.c')
-rw-r--r--src/ui.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui.c b/src/ui.c
index b268cd78d..6fc5bde21 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -180,7 +180,7 @@ ui_inchar(buf, maxlen, wtime, tb_change_cnt)
/* ... there is no need for CTRL-C to interrupt something, don't let
* it set got_int when it was mapped. */
- if (mapped_ctrl_c)
+ if ((mapped_ctrl_c | curbuf->b_mapped_ctrl_c) & State)
ctrl_c_interrupts = FALSE;
}