# HG changeset patch # User Christian Brabandt # Date 1470772807 -7200 # Node ID f17ba1c9d209756780b95dcd2172681a4c9d291e # Parent 9942f894e70943116bbb27ec396b0885c01b0fe3 commit https://github.com/vim/vim/commit/c9fb77c69244870a97384152f20845665c19fe39 Author: Bram Moolenaar Date: Tue Aug 9 21:51:40 2016 +0200 patch 7.4.2188 Problem: Completion does not work properly with some plugins. Solution: Revert the part related to typing CTRL-E. (closes https://github.com/vim/vim/issues/972) diff --git a/src/edit.c b/src/edit.c --- 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 --- 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 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2188, +/**/ 2187, /**/ 2186,