diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-01-13 03:27:23 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-13 03:27:23 -0500 |
| commit | 7f3999ac806daefa078b4db0781bfc1e190e135e (patch) | |
| tree | 6386cdb6bf191873fc6ea1593a713e145810165a /src/nvim/os/input.c | |
| parent | 5c87d40acdd02286baf492067031c93d93b7d389 (diff) | |
| parent | 8eeda7169aa47881f0b6d697e291a1ef85c43e4e (diff) | |
| download | rneovim-7f3999ac806daefa078b4db0781bfc1e190e135e.tar.gz rneovim-7f3999ac806daefa078b4db0781bfc1e190e135e.tar.bz2 rneovim-7f3999ac806daefa078b4db0781bfc1e190e135e.zip | |
Merge pull request #3996 from justinmk/ctrlc
vim-patch:7.4.569, 7.4.573
Diffstat (limited to 'src/nvim/os/input.c')
| -rw-r--r-- | src/nvim/os/input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c index ef6b5ff6f5..e632544856 100644 --- a/src/nvim/os/input.c +++ b/src/nvim/os/input.c @@ -19,6 +19,7 @@ #include "nvim/getchar.h" #include "nvim/main.h" #include "nvim/misc1.h" +#include "nvim/misc2.h" #define READ_BUFFER_SIZE 0xfff #define INPUT_BUFFER_SIZE (READ_BUFFER_SIZE * 4) @@ -357,7 +358,7 @@ static void read_cb(Stream *stream, RBuffer *buf, size_t c, void *data, static void process_interrupts(void) { - if (mapped_ctrl_c) { + if ((mapped_ctrl_c | curbuf->b_mapped_ctrl_c) & get_real_state()) { return; } |