diff options
| -rw-r--r-- | src/getchar.c | 11 | ||||
| -rw-r--r-- | src/testdir/test_popup.vim | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 22 insertions, 6 deletions
diff --git a/src/getchar.c b/src/getchar.c index 2b1bbde4b0..2e5dfb3cef 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2342,10 +2342,10 @@ typedef enum { /* * Check if the bytes at the start of the typeahead buffer are a character used - * in CTRL-X mode. This includes the form with a CTRL modifier. + * in Insert mode completion. This includes the form with a CTRL modifier. */ static int -at_ctrl_x_key(void) +at_ins_compl_key(void) { char_u *p = typebuf.tb_buf + typebuf.tb_off; int c = *p; @@ -2355,7 +2355,8 @@ at_ctrl_x_key(void) && p[1] == KS_MODIFIER && (p[2] & MOD_MASK_CTRL)) c = p[3] & 0x1f; - return vim_is_ctrl_x_key(c); + return (ctrl_x_mode_not_default() && vim_is_ctrl_x_key(c)) + || (compl_status_local() && (c == Ctrl_N || c == Ctrl_P)); } /* @@ -2486,9 +2487,7 @@ handle_mapping( && !(State == HITRETURN && (tb_c1 == CAR || tb_c1 == ' ')) && State != ASKMORE && State != CONFIRM - && !((ctrl_x_mode_not_default() && at_ctrl_x_key()) - || (compl_status_local() - && (tb_c1 == Ctrl_N || tb_c1 == Ctrl_P)))) + && !at_ins_compl_key()) { #ifdef FEAT_GUI if (gui.in_use && tb_c1 == CSI && typebuf.tb_len >= 2 diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim index 5d04583717..9832ccf606 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -325,6 +325,21 @@ func Test_compl_vim_cmds_after_register_expr() bwipe! endfunc +func Test_compl_ignore_mappings() + call setline(1, ['foo', 'bar', 'baz', 'foobar']) + inoremap <C-P> (C-P) + inoremap <C-N> (C-N) + normal! G + call feedkeys("o\<C-X>\<C-N>\<C-N>\<C-N>\<C-P>\<C-N>\<C-Y>", 'tx') + call assert_equal('baz', getline('.')) + " Also test with unsimplified keys + call feedkeys("o\<C-X>\<*C-N>\<*C-N>\<*C-N>\<*C-P>\<*C-N>\<C-Y>", 'tx') + call assert_equal('baz', getline('.')) + iunmap <C-P> + iunmap <C-N> + bwipe! +endfunc + func DummyCompleteOne(findstart, base) if a:findstart return 0 diff --git a/src/version.c b/src/version.c index ee5a9ab026..d94e2fd96e 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4848, +/**/ 4847, /**/ 4846, |