Mercurial > vim
changeset 9826:f17ba1c9d209 v7.4.2188
commit https://github.com/vim/vim/commit/c9fb77c69244870a97384152f20845665c19fe39
Author: Bram Moolenaar <Bram@vim.org>
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 09 Aug 2016 22:00:07 +0200 |
| parents | 9942f894e709 |
| children | bc358576ace1 |
| files | src/edit.c src/testdir/test_popup.vim src/version.c |
| diffstat | 3 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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