diff options
| -rw-r--r-- | src/testdir/test_popup.vim | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim index 6e07393685..10eaf3a632 100644 --- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -17,16 +17,18 @@ func! ListMonths() endfunc func! Test_popup_complete2() - " Insert match immediately, if there is only one match - " <c-e> Should select a character from the line below - " TODO: test disabled because the code change has been reverted. - throw "Skipped: Bug with <c-e> and popupmenu not fixed yet" + " Although the popupmenu is not visible, this does not mean completion mode + " has ended. After pressing <f5> to complete the currently typed char, Vim + " still stays in the first state of the completion (:h ins-completion-menu), + " although the popupmenu wasn't shown <c-e> will remove the inserted + " completed text (:h complete_CTRL-E), while the following <c-e> will behave + " like expected (:h i_CTRL-E) new inoremap <f5> <c-r>=ListMonths()<cr> 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)) + call assert_equal(["Dece", "", "December2015"], getline(1,3)) %d bw! endfu diff --git a/src/version.c b/src/version.c index 660b8285e0..a603fe3e9e 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 8, +/**/ 7, /**/ 6, |