diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-06-26 18:38:13 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-06-26 18:38:13 +0200 |
commit | 00672e1d3f59dbff91a18d418b2984be96f89ee5 (patch) | |
tree | 4d5102a1b35281b145fcd6f34f210e01f86e5725 | |
parent | 04e2b4b0c4866586ecce3d1567f9b0bdeeb31f15 (diff) | |
download | vim-git-00672e1d3f59dbff91a18d418b2984be96f89ee5.tar.gz |
patch 7.4.1961v7.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)
-rw-r--r-- | src/Makefile | 1 | ||||
-rw-r--r-- | src/edit.c | 6 | ||||
-rw-r--r-- | src/option.c | 3 | ||||
-rw-r--r-- | src/testdir/test_alot.vim | 1 | ||||
-rw-r--r-- | src/testdir/test_popup.vim | 35 | ||||
-rw-r--r-- | src/version.c | 2 |
6 files changed, 46 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 5c4e44f0d..4058f1920 100644 --- 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 \ diff --git a/src/edit.c b/src/edit.c index 0ba2627ca..234e03dff 100644 --- 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; diff --git a/src/option.c b/src/option.c index b17fc2822..80bd867a1 100644 --- 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; diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim index d8d460aec..444085e18 100644 --- 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 diff --git a/src/testdir/test_popup.vim b/src/testdir/test_popup.vim new file mode 100644 index 000000000..a5673c930 --- /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 diff --git a/src/version.c b/src/version.c index a810da547..0c744643e 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1961, +/**/ 1960, /**/ 1959, |