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)

diff --git a/src/Makefile b/src/Makefile
index 5c4e44f0d17787c6b13f52597286b8c3e2e03bba..4058f192003d4ab81296b2fa59e13cab3af690e4 100644 (file)
--- 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 0ba2627ca7a3b20a46d118ab2a8101807b7eb6de..234e03dff9040abfe38bae747e8649a4cc015c6f 100644 (file)
--- 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 b17fc2822bed165c7390430d4bf06f60dff9ea96..80bd867a1fc5a9cd47f110a35593449548d66efb 100644 (file)
--- 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 d8d460aec45b00741d437db332b68fd8e474a953..444085e181fefbee988441c7f31c56e9735af6a8 100644 (file)
--- 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 (file)
index 0000000..a5673c9
--- /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 a810da547c331297d96abc86d129a42ddb56c5df..0c744643ecc157d8eae564bea1e3a0df8129b949 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1961,
 /**/
     1960,
 /**/