Merge #10323 from janlazo/vim-8.1.1055

vim-patch:8.0.{1479,1480,1482},8.1.1055
This commit is contained in:
Justin M. Keyes
2019-06-25 02:37:50 +02:00
committed by GitHub
9 changed files with 151 additions and 69 deletions

View File

@@ -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)))
) {