patch 7.4.2188

Problem:    Completion does not work properly with some plugins.
Solution:   Revert the part related to typing CTRL-E. (closes #972)

diff --git a/src/edit.c b/src/edit.c
index 6dae4a01e6c14fb3b7e9504cd995fc588c732c6d..2281232278bb2c8f5bbacb84bc693a9af02faf62 100644 (file)
--- 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 708739cb229b2f078403599eba679c63874f7b62..34a2251ab4ee14792a6456824d2c7745d20714a3 100644 (file)
--- 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
   "  <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

diff --git a/src/version.c b/src/version.c
index 100cf55c748a1e99c9e54bb884d5be1b8ba94177..4d4c16e27136606b1b56ef1a4f92d60c54a854e8 100644 (file)
--- 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,
 /**/