Mercurial > vim
changeset 9465:203792348947 v7.4.2013
commit https://github.com/vim/vim/commit/67081e50616ae9546621072c5eaaa59bd0a4bed7
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jul 9 21:49:03 2016 +0200
patch 7.4.2013
Problem: Using "noinsert" in 'completeopt' breaks redo.
Solution: Set compl_curr_match. (Shougo, closes https://github.com/vim/vim/issues/874)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 09 Jul 2016 22:00:06 +0200 |
parents | be72f4201a1d |
children | d5ccc59b203f |
files | src/edit.c src/testdir/test_popup.vim src/version.c |
diffstat | 3 files changed, 44 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/edit.c +++ b/src/edit.c @@ -4680,6 +4680,7 @@ ins_compl_insert(void) EMPTY_IF_NULL(compl_shown_match->cp_text[CPT_INFO])); } set_vim_var_dict(VV_COMPLETED_ITEM, dict); + compl_curr_match = compl_shown_match; } /*
--- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -1,6 +1,5 @@ " Test for completion menu -inoremap <F5> <C-R>=ListMonths()<CR> let g:months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'] let g:setting = '' @@ -13,23 +12,45 @@ func ListMonths() endfunc func! Test_popup_completion_insertmode() - new - call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx') - call assert_equal('February', getline(1)) - %d - let g:setting = 'noinsertmode' - call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx') - call assert_equal('February', getline(1)) - call assert_false(pumvisible()) - %d - let g:setting = '' - call feedkeys("a\<f5>". repeat("\<c-n>",12)."\<enter>\<esc>", 'tx') - call assert_equal('', getline(1)) - %d - call feedkeys("a\<f5>\<c-p>\<enter>\<esc>", 'tx') - call assert_equal('', getline(1)) - %d - call feedkeys("a\<f5>\<c-p>\<c-p>\<enter>\<esc>", 'tx') - call assert_equal('December', getline(1)) - bwipe! + new + inoremap <F5> <C-R>=ListMonths()<CR> + + call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx') + call assert_equal('February', getline(1)) + %d + let g:setting = 'noinsertmode' + call feedkeys("a\<f5>\<down>\<enter>\<esc>", 'tx') + call assert_equal('February', getline(1)) + call assert_false(pumvisible()) + %d + let g:setting = '' + call feedkeys("a\<f5>". repeat("\<c-n>",12)."\<enter>\<esc>", 'tx') + call assert_equal('', getline(1)) + %d + call feedkeys("a\<f5>\<c-p>\<enter>\<esc>", 'tx') + call assert_equal('', getline(1)) + %d + call feedkeys("a\<f5>\<c-p>\<c-p>\<enter>\<esc>", 'tx') + call assert_equal('December', getline(1)) + + bwipe! + iunmap <F5> endfunc + +function! ComplTest() abort + call complete(1, ['source', 'soundfold']) + return '' +endfunction + +func Test_noinsert_complete() + new + set completeopt+=noinsert + inoremap <F5> <C-R>=ComplTest()<CR> + call feedkeys("i\<F5>soun\<CR>\<CR>\<ESC>.", 'tx') + call assert_equal('soundfold', getline(1)) + call assert_equal('soundfold', getline(2)) + + bwipe! + set completeopt-=noinsert + iunmap <F5> +endfunc