diff --git a/src/insexpand.c b/src/insexpand.c index ba66e51cfb..d712181bcd 100644 --- a/src/insexpand.c +++ b/src/insexpand.c @@ -1363,6 +1363,10 @@ ins_compl_show_pum(void) pum_display(compl_match_array, compl_match_arraysize, cur); curwin->w_cursor.col = col; + // After adding leader, set the current match to shown match. + if (compl_started && compl_curr_match != compl_shown_match) + compl_curr_match = compl_shown_match; + #ifdef FEAT_EVAL if (has_completechanged()) trigger_complete_changed_event(cur); diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim index a0a1f745a7..879d1fa3e5 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -1159,9 +1159,21 @@ func Test_CompleteChanged() call feedkeys("a\\\\\", 'tx') call assert_equal('foobar', g:word) + func Omni_test(findstart, base) + if a:findstart + return col(".") + endif + return [#{word: "one"}, #{word: "two"}, #{word: "five"}] + endfunc + set omnifunc=Omni_test + set completeopt=menu,menuone + call feedkeys("i\\\\\f", 'tx') + call assert_equal('five', g:word) + autocmd! AAAAA_Group set complete& completeopt& delfunc! OnPumChange + delfunc! Omni_test bw! endfunc diff --git a/src/version.c b/src/version.c index 7dca96a6b0..78d8cf50d0 100644 --- a/src/version.c +++ b/src/version.c @@ -704,6 +704,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 75, /**/ 74, /**/