diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-06-25 02:37:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 02:37:50 +0200 |
| commit | 615fc6826359b4171fbb40ea34ba7ddf29bea045 (patch) | |
| tree | 2da5172c89f512da4fe0c625aff1fe74c62ef248 /src/nvim/getchar.c | |
| parent | 79450f2da97e352676516d63521c18fbac46186b (diff) | |
| parent | ed2d651b504012d89f00ea89814cfcb15a0faf3f (diff) | |
| download | rneovim-615fc6826359b4171fbb40ea34ba7ddf29bea045.tar.gz rneovim-615fc6826359b4171fbb40ea34ba7ddf29bea045.tar.bz2 rneovim-615fc6826359b4171fbb40ea34ba7ddf29bea045.zip | |
Merge #10323 from janlazo/vim-8.1.1055
vim-patch:8.0.{1479,1480,1482},8.1.1055
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 10937879a1..7efae1e637 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -1778,7 +1778,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))) ) { |