From 38506553f7213cc9df0f222c29127a9f182351e4 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 8 Apr 2022 19:01:08 +0800
Subject: [PATCH 1/2] vim-patch:8.2.4711: when 'insermode' is set :edit from
 <Cmd> mapping misbehaves

Problem:    When 'insermode' is set :edit from <Cmd> mapping misbehaves.
Solution:   Don't set "need_start_insertmode" when already in Insert mode.
            (closes vim/vim#10116)
https://github.com/vim/vim/commit/3a56b6d405fc0f1ca928b77382f97d0c552bea64
---
 src/nvim/ex_cmds.c             |  2 +-
 src/nvim/testdir/test_edit.vim | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 4e98319723..98aabe89b3 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -2875,7 +2875,7 @@ int do_ecmd(int fnum, char_u *ffname, char_u *sfname, exarg_T *eap, linenr_T new
     redraw_curbuf_later(NOT_VALID);     // redraw this buffer later
   }
 
-  if (p_im) {
+  if (p_im && (State & INSERT) == 0) {
     need_start_insertmode = true;
   }
 
diff --git a/src/nvim/testdir/test_edit.vim b/src/nvim/testdir/test_edit.vim
index 360b3aaaa0..eea5d190b2 100644
--- a/src/nvim/testdir/test_edit.vim
+++ b/src/nvim/testdir/test_edit.vim
@@ -1627,6 +1627,29 @@ func Test_edit_is_a_directory()
   call delete(dirname, 'rf')
 endfunc
 
+" Using :edit without leaving 'insertmode' should not cause Insert mode to be
+" re-entered immediately after <C-L>
+func Test_edit_insertmode_ex_edit()
+  CheckRunVimInTerminal
+
+  let lines =<< trim END
+    set insertmode noruler
+    inoremap <C-B> <Cmd>edit Xfoo<CR>
+  END
+  call writefile(lines, 'Xtest_edit_insertmode_ex_edit')
+
+  let buf = RunVimInTerminal('-S Xtest_edit_insertmode_ex_edit', #{rows: 6})
+  call TermWait(buf, 50)
+  call assert_match('^-- INSERT --\s*$', term_getline(buf, 6))
+  call term_sendkeys(buf, "\<C-B>\<C-L>")
+  call TermWait(buf, 50)
+  call assert_notmatch('^-- INSERT --\s*$', term_getline(buf, 6))
+
+  " clean up
+  call StopVimInTerminal(buf)
+  call delete('Xtest_edit_insertmode_ex_edit')
+endfunc
+
 func Test_edit_browse()
   " in the GUI this opens a file picker, we only test the terminal behavior
   CheckNotGui

From b099bb1f2f5c294b4c73e262dc435a3318e9d523 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Fri, 8 Apr 2022 19:25:37 +0800
Subject: [PATCH 2/2] test: add a test for #16823

---
 test/functional/editor/mode_insert_spec.lua | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/test/functional/editor/mode_insert_spec.lua b/test/functional/editor/mode_insert_spec.lua
index 528e228121..c38acbe96a 100644
--- a/test/functional/editor/mode_insert_spec.lua
+++ b/test/functional/editor/mode_insert_spec.lua
@@ -6,6 +6,8 @@ local expect = helpers.expect
 local command = helpers.command
 local eq = helpers.eq
 local eval = helpers.eval
+local meths = helpers.meths
+local poke_eventloop = helpers.poke_eventloop
 
 describe('insert-mode', function()
   before_each(function()
@@ -128,4 +130,26 @@ describe('insert-mode', function()
       expect('<M-1><D-2><M-7><D-8>')
     end)
   end)
+
+  describe([[With 'insertmode', Insert mode is not re-entered immediately after <C-L>]], function()
+    before_each(function()
+      command('set insertmode')
+      poke_eventloop()
+      eq({mode = 'i', blocking = false}, meths.get_mode())
+    end)
+
+    it('after calling :edit from <Cmd> mapping', function()
+      command('inoremap <C-B> <Cmd>edit Xfoo<CR>')
+      feed('<C-B><C-L>')
+      poke_eventloop()
+      eq({mode = 'n', blocking = false}, meths.get_mode())
+    end)
+
+    it('after calling :edit from RPC #16823', function()
+      command('edit Xfoo')
+      feed('<C-L>')
+      poke_eventloop()
+      eq({mode = 'n', blocking = false}, meths.get_mode())
+    end)
+  end)
 end)