aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.2188

Browse Source 
Problem:    Completion does not work properly with some plugins.
Solution:   Revert the part related to typing CTRL-E. (closes #972)
This commit is contained in:
Bram Moolenaar 2016-08-09 21:51:40 +02:00
parent 7547a78446
commit c9fb77c692
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/edit.c
View File

@ -3893,7 +3893,7 @@ ins_compl_prep(int c)
/* CTRL-E means completion is Ended, go back to the typed text. /* CTRL-E means completion is Ended, go back to the typed text.
* but only do this, if the Popup is still visible */ * but only do this, if the Popup is still visible */
if (c == Ctrl_E && pum_visible()) if (c == Ctrl_E)
{ {
ins_compl_delete(); ins_compl_delete();
if (compl_leader != NULL) if (compl_leader != NULL)

11
src/testdir/test_popup.vim
View File

@ -170,11 +170,12 @@ func! Test_popup_complete()
" Insert match immediately, if there is only one match " Insert match immediately, if there is only one match
" <c-e> Should select a character from the line below " <c-e> Should select a character from the line below
call append(1, ["December2015"]) " TODO: test disabled because the code change has been reverted.
:1 " call append(1, ["December2015"])
call feedkeys("aD\<f5>\<C-E>\<C-E>\<C-E>\<C-E>\<enter>\<esc>", 'tx') " :1
call assert_equal(["December2015", "", "December2015"], getline(1,3)) " call feedkeys("aD\<f5>\<C-E>\<C-E>\<C-E>\<C-E>\<enter>\<esc>", 'tx')
%d " call assert_equal(["December2015", "", "December2015"], getline(1,3))
" %d
" use menuone for 'completeopt' " use menuone for 'completeopt'
" Since for the first <c-y> the menu is still shown, will only select " Since for the first <c-y> the menu is still shown, will only select

2
src/version.c
View File

@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2188,
/**/ /**/
2187, 2187,
/**/ /**/