summaryrefslogtreecommitdiffstats
path: root/src/getchar.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-02-09 12:13:34 +0100
committerBram Moolenaar <Bram@vim.org>2018-02-09 12:13:34 +0100
commitbc0e9adae9c253f36803665180e4b576d1e725ab (patch)
tree858a1a7156699a6b2e14e51feb4bf8b296d4a865 /src/getchar.c
parentdff72ba4459f54cac2ce40eea3d92097660c7b9f (diff)
patch 8.0.1479: insert mode completion state is confusingv8.0.1479
Problem: Insert mode completion state is confusing. Solution: Move ctrl_x_mode into edit.c. Add CTRL_X_NORMAL for zero.
Diffstat (limited to 'src/getchar.c')
-rw-r--r--src/getchar.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/getchar.c b/src/getchar.c
index 70cf4f1727..39ccebb64d 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2115,7 +2115,8 @@ vgetorpeek(int advance)
&& State != ASKMORE
&& State != CONFIRM
#ifdef FEAT_INS_EXPAND
- && !((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)))
#endif