mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-23 03:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.569/573

Browse Source 
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)

651863c94a

Problem:    Mapping CTRL-C in Visual mode doesn't work. (Ingo Karkat)
Solution:   Call get_real_state() instead of using State directly.

5000869712
This commit is contained in:
Shougo Matsushita
2015-12-19 10:03:17 +09:00
committed by Justin M. Keyes
parent 420fe1fe73
commit 3dfbeabf35
8 changed files with 67 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/terminal.c
View File

@@ -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