diff options
| author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2015-12-19 10:03:17 +0900 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-01-13 01:56:36 -0500 |
| commit | 3dfbeabf35dbfe5494a4adce7b4d94d56bbe0171 (patch) | |
| tree | f3b6f3c95a1e1b20545798e94a88d774bca8b1ea /src/nvim/terminal.c | |
| parent | 420fe1fe73153cc7407a770fc2d6ee85ff490bff (diff) | |
| download | rneovim-3dfbeabf35dbfe5494a4adce7b4d94d56bbe0171.tar.gz rneovim-3dfbeabf35dbfe5494a4adce7b4d94d56bbe0171.tar.bz2 rneovim-3dfbeabf35dbfe5494a4adce7b4d94d56bbe0171.zip | |
vim-patch:7.4.569/573
vim-patch:7.4.569
vim-patch:7.4.573
Helped-by: @glts https://github.com/neovim/neovim/pull/2621
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)
https://github.com/vim/vim/commit/651863c94a882a97aec7968fc87a638ff78e56ff
Problem: Mapping CTRL-C in Visual mode doesn't work. (Ingo Karkat)
Solution: Call get_real_state() instead of using State directly.
https://github.com/vim/vim/commit/5000869712f799d9ca25c0e45dc21d332edae5f4
Diffstat (limited to 'src/nvim/terminal.c')
| -rw-r--r-- | src/nvim/terminal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c index 6045acd1cb..b129a93a05 100644 --- a/src/nvim/terminal.c +++ b/src/nvim/terminal.c @@ -79,7 +79,7 @@ typedef struct terminal_state { Terminal *term; int save_state; // saved value of State int save_rd; // saved value of RedrawingDisabled - bool save_mapped_ctrl_c; // saved value of mapped_ctrl_c; + int save_mapped_ctrl_c; // saved value of mapped_ctrl_c; bool close; bool got_bs; // if the last input was <C-\> } TerminalState; @@ -367,7 +367,7 @@ void terminal_enter(void) State = TERM_FOCUS; RedrawingDisabled = false; s->save_mapped_ctrl_c = mapped_ctrl_c; - mapped_ctrl_c = true; + mapped_ctrl_c = MAP_ALL_MODES; // go to the bottom when the terminal is focused adjust_topline(s->term, buf, false); // erase the unfocused cursor |