diff options
author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-06-23 21:20:19 -0400 |
---|---|---|
committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-06-23 22:23:50 -0400 |
commit | 287f7a46a4210f69474955fa56f6ca4b4c734f2d (patch) | |
tree | d8966f5e094a42f8309cb213e31778b28fd9fd4c /src/nvim/getchar.c | |
parent | 3dcf2d5c1654e1207e60abc0b9c4864d89bb2f77 (diff) | |
download | rneovim-287f7a46a4210f69474955fa56f6ca4b4c734f2d.tar.gz rneovim-287f7a46a4210f69474955fa56f6ca4b4c734f2d.tar.bz2 rneovim-287f7a46a4210f69474955fa56f6ca4b4c734f2d.zip |
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
Diffstat (limited to 'src/nvim/getchar.c')
-rw-r--r-- | src/nvim/getchar.c | 2 |
1 files changed, 1 insertions, 1 deletions
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))) ) { |