IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.2191: when using modifyOtherKeys CTRL-X mode may not work

Browse Source 
Problem:    When using modifyOtherKeys CTRL-X mode may not work.
Solution:   Recognize a control character also in the form with a modifier.
88d3d09e07
This commit is contained in:
zeertzjq 2022-04-30 17:14:00 +08:00
parent fcdf24d8be
commit db355ca4e5
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/getchar.c
View File

@ -1768,6 +1768,19 @@ static int put_string_in_typebuf(int offset, int slen, char_u *string, int new_s
return OK;
}
/// Check if the bytes at the start of the typeahead buffer are a character used
/// in CTRL-X mode. This includes the form with a CTRL modifier.
static bool at_ctrl_x_key(void)
{
char_u *p = typebuf.tb_buf + typebuf.tb_off;
int c = *p;
if (typebuf.tb_len > 3 && c == K_SPECIAL && p[1] == KS_MODIFIER && (p[2] & MOD_MASK_CTRL)) {
c = p[3] & 0x1f;
}
return vim_is_ctrl_x_key(c);
}
/// Check if typebuf.tb_buf[] contains a modifer plus key that can be changed
/// into just a key, apply that.
/// Check from typebuf.tb_buf[typebuf.tb_off] to typebuf.tb_buf[typebuf.tb_off + "max_offset"].
@ -1870,7 +1883,7 @@ static int handle_mapping(int *keylenp, bool *timedout, int *mapdepth)
&& !(State == HITRETURN && (tb_c1 == CAR || tb_c1 == ' '))
&& State != ASKMORE
&& State != CONFIRM
&& !((ctrl_x_mode_not_default() && vim_is_ctrl_x_key(tb_c1))
&& !((ctrl_x_mode_not_default() && at_ctrl_x_key())
|| ((compl_cont_status & CONT_LOCAL)
&& (tb_c1 == Ctrl_N || tb_c1 == Ctrl_P)))) {
if (tb_c1 == K_SPECIAL) {