Mercurial > vim
changeset 9359:35b173e37dc6 v7.4.1961
commit https://github.com/vim/vim/commit/00672e1d3f59dbff91a18d418b2984be96f89ee5
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jun 26 18:38:13 2016 +0200
patch 7.4.1961
Problem: When 'insertmode' is reset while doing completion the popup menu
remains even though Vim is in Normal mode.
Solution: Ignore stop_insert_mode when the popup menu is visible. Don't set
stop_insert_mode when 'insertmode' was already off. (Christian
Brabandt)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 26 Jun 2016 18:45:06 +0200 |
| parents | b9f817fb4622 |
| children | 25b3f5287dbc |
| files | src/Makefile src/edit.c src/option.c src/testdir/test_alot.vim src/testdir/test_popup.vim src/version.c |
| diffstat | 6 files changed, 46 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile +++ b/src/Makefile @@ -2045,6 +2045,7 @@ test_arglist \ test_packadd \ test_partial \ test_perl \ + test_popup \ test_quickfix \ test_regexp_latin \ test_regexp_utf8 \
--- a/src/edit.c +++ b/src/edit.c @@ -649,7 +649,11 @@ edit( if (update_Insstart_orig) Insstart_orig = Insstart; - if (stop_insert_mode) + if (stop_insert_mode +#ifdef FEAT_INS_EXPAND + && !pum_visible() +#endif + ) { /* ":stopinsert" used or 'insertmode' reset */ count = 0;
--- a/src/option.c +++ b/src/option.c @@ -8001,7 +8001,8 @@ set_bool_option( need_start_insertmode = TRUE; stop_insert_mode = FALSE; } - else + /* only reset if it was set previously */ + else if (old_value) { need_start_insertmode = FALSE; stop_insert_mode = TRUE;
--- a/src/testdir/test_alot.vim +++ b/src/testdir/test_alot.vim @@ -21,6 +21,7 @@ source test_matchstrpos.vim source test_menu.vim source test_messages.vim source test_partial.vim +source test_popup.vim source test_reltime.vim source test_searchpos.vim source test_set.vim
new file mode 100644 --- /dev/null +++ b/src/testdir/test_popup.vim @@ -0,0 +1,35 @@ +" 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 = '' + +func ListMonths() + if g:setting != '' + exe ":set" g:setting + endif + call complete(col('.'), g:months) + return '' +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! +endfunc