patch 8.2.4865: :startinsert right after :stopinsert may not work
Problem: :startinsert right after :stopinsert does not work when popup menu
is still visible.
Solution: Use ins_compl_active() instead of pum_visible(). (closes #10352)
diff --git a/src/edit.c b/src/edit.c
index 61c1694..65b760b 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -448,7 +448,7 @@
if (update_Insstart_orig)
Insstart_orig = Insstart;
- if (stop_insert_mode && !pum_visible())
+ if (stop_insert_mode && !ins_compl_active())
{
// ":stopinsert" used or 'insertmode' reset
count = 0;
diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim
index 75ec03c..6bb4997 100644
--- a/src/testdir/test_ins_complete.vim
+++ b/src/testdir/test_ins_complete.vim
@@ -555,6 +555,15 @@
call delete('Xpumscript')
endfunc
+func Test_complete_stopinsert_startinsert()
+ nnoremap <F2> <Cmd>startinsert<CR>
+ inoremap <F2> <Cmd>stopinsert<CR>
+ " This just checks if this causes an error
+ call feedkeys("i\<C-X>\<C-N>\<F2>\<F2>", 'x')
+ nunmap <F2>
+ iunmap <F2>
+endfunc
+
func Test_pum_with_folds_two_tabs()
CheckScreendump
diff --git a/src/version.c b/src/version.c
index 1922323..bf2c8dc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4865,
+/**/
4864,
/**/
4863,