To: vim_dev@googlegroups.com Subject: Patch 7.4.2188 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2188 (after 7.4.2146) Problem: Completion does not work properly with some plugins. Solution: Revert the part related to typing CTRL-E. (closes #972) Files: src/edit.c, src/testdir/test_popup.vim *** ../vim-7.4.2187/src/edit.c 2016-08-02 22:35:58.306224634 +0200 --- src/edit.c 2016-08-09 21:46:37.137140930 +0200 *************** *** 3893,3899 **** /* 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()) { ins_compl_delete(); if (compl_leader != NULL) --- 3893,3899 ---- /* 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) { ins_compl_delete(); if (compl_leader != NULL) *** ../vim-7.4.2187/src/testdir/test_popup.vim 2016-08-02 23:04:46.181887192 +0200 --- src/testdir/test_popup.vim 2016-08-09 21:47:16.408781759 +0200 *************** *** 170,180 **** " Insert match immediately, if there is only one match " Should select a character from the line below ! call append(1, ["December2015"]) ! :1 ! call feedkeys("aD\\\\\\\", 'tx') ! call assert_equal(["December2015", "", "December2015"], getline(1,3)) ! %d " use menuone for 'completeopt' " Since for the first the menu is still shown, will only select --- 170,181 ---- " Insert match immediately, if there is only one match " Should select a character from the line below ! " TODO: test disabled because the code change has been reverted. ! " call append(1, ["December2015"]) ! " :1 ! " call feedkeys("aD\\\\\\\", 'tx') ! " call assert_equal(["December2015", "", "December2015"], getline(1,3)) ! " %d " use menuone for 'completeopt' " Since for the first the menu is still shown, will only select *** ../vim-7.4.2187/src/version.c 2016-08-08 23:26:48.086394521 +0200 --- src/version.c 2016-08-09 21:48:46.935954037 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2188, /**/ -- No engineer can take a shower without wondering if some sort of Teflon coating would make showering unnecessary. (Scott Adams - The Dilbert principle) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///