diff --git a/src/edit.c b/src/edit.c index 6dae4a01e6..2281232278 100644 --- a/src/edit.c +++ b/src/edit.c @@ -3893,7 +3893,7 @@ ins_compl_prep(int c) /* CTRL-E means completion is Ended, go back to the typed text. * but only do this, if the Popup is still visible */ - if (c == Ctrl_E && pum_visible()) + if (c == Ctrl_E) { ins_compl_delete(); if (compl_leader != NULL) diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim index 708739cb22..34a2251ab4 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -170,11 +170,12 @@ func! Test_popup_complete() " Insert match immediately, if there is only one match " Should select a character from the line below - call append(1, ["December2015"]) - :1 - call feedkeys("aD\\\\\\\", 'tx') - call assert_equal(["December2015", "", "December2015"], getline(1,3)) - %d + " TODO: test disabled because the code change has been reverted. + " call append(1, ["December2015"]) + " :1 + " call feedkeys("aD\\\\\\\", 'tx') + " call assert_equal(["December2015", "", "December2015"], getline(1,3)) + " %d " use menuone for 'completeopt' " Since for the first the menu is still shown, will only select diff --git a/src/version.c b/src/version.c index 100cf55c74..4d4c16e271 100644 --- a/src/version.c +++ b/src/version.c @@ -763,6 +763,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2188, /**/ 2187, /**/