Permalink
Browse files

patch 7.4.2188

Problem:    Completion does not work properly with some plugins.
Solution:   Revert the part related to typing CTRL-E. (closes #972)
  • Loading branch information...
1 parent 7547a78 commit c9fb77c69244870a97384152f20845665c19fe39 @brammool brammool committed Aug 9, 2016
Showing with 9 additions and 6 deletions.
  1. +1 −1 src/edit.c
  2. +6 −5 src/testdir/test_popup.vim
  3. +2 −0 src/version.c
View
@@ -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)
@@ -170,11 +170,12 @@ func! Test_popup_complete()
" Insert match immediately, if there is only one match
" <c-e> Should select a character from the line below
- call append(1, ["December2015"])
- :1
- call feedkeys("aD\<f5>\<C-E>\<C-E>\<C-E>\<C-E>\<enter>\<esc>", '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\<f5>\<C-E>\<C-E>\<C-E>\<C-E>\<enter>\<esc>", 'tx')
+ " call assert_equal(["December2015", "", "December2015"], getline(1,3))
+ " %d
" use menuone for 'completeopt'
" Since for the first <c-y> the menu is still shown, will only select
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2188,
+/**/
2187,
/**/
2186,

0 comments on commit c9fb77c

Please sign in to comment.