From 287f7a46a4210f69474955fa56f6ca4b4c734f2d Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sun, 23 Jun 2019 21:20:19 -0400 Subject: vim-patch:8.0.1479: insert mode completion state is confusing Problem: Insert mode completion state is confusing. Solution: Move ctrl_x_mode into edit.c. Add CTRL_X_NORMAL for zero. https://github.com/vim/vim/commit/bc0e9adae9c253f36803665180e4b576d1e725ab --- src/nvim/getchar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/getchar.c') diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 44e4e09486..27ad6bb86c 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -1770,7 +1770,7 @@ static int vgetorpeek(int advance) && !(State == HITRETURN && (c1 == CAR || c1 == ' ')) && State != ASKMORE && State != CONFIRM - && !((ctrl_x_mode != 0 && vim_is_ctrl_x_key(c1)) + && !((ctrl_x_mode_not_default() && vim_is_ctrl_x_key(c1)) || ((compl_cont_status & CONT_LOCAL) && (c1 == Ctrl_N || c1 == Ctrl_P))) ) { -- cgit