2 files changed, 24 insertions, 2 deletions
diff --git a/test/functional/insert/ctrl_o_spec.lua b/test/functional/insert/ctrl_o_spec.lua
index 950ab24219..011954fa9d 100644
--- a/test/functional/insert/ctrl_o_spec.lua
+++ b/test/functional/insert/ctrl_o_spec.lua
@@ -1,5 +1,4 @@
 local helpers = require('test.functional.helpers')(after_each)
-local assert_alive = helpers.assert_alive
 local clear = helpers.clear
 local eq = helpers.eq
 local eval = helpers.eval
@@ -46,7 +45,7 @@ describe('insert-mode Ctrl-O', function()
   it("doesn't cancel Ctrl-O mode when processing event", function()
     feed('iHello World<c-o>')
     eq({mode='niI', blocking=false}, meths.get_mode()) -- fast event
-    assert_alive()  -- causes K_EVENT key
+    eq(2, eval('1+1'))  -- causes K_EVENT key
     eq({mode='niI', blocking=false}, meths.get_mode()) -- still in ctrl-o mode
     feed('dd')
     eq({mode='i', blocking=false}, meths.get_mode()) -- left ctrl-o mode
diff --git a/test/functional/visual/ctrl_o_spec.lua b/test/functional/visual/ctrl_o_spec.lua
new file mode 100644
index 0000000000..65a128053c
--- /dev/null
+++ b/test/functional/visual/ctrl_o_spec.lua
@@ -0,0 +1,23 @@
+local helpers = require('test.functional.helpers')(after_each)
+local clear = helpers.clear
+local eq = helpers.eq
+local eval = helpers.eval
+local expect = helpers.expect
+local feed = helpers.feed
+local meths = helpers.meths
+
+describe('select-mode Ctrl-O', function()
+  before_each(clear)
+
+  it("doesn't cancel Ctrl-O mode when processing event", function()
+    feed('iHello World<esc>gh<c-o>')
+    eq({mode='vs', blocking=false}, meths.get_mode()) -- fast event
+    eq(2, eval('1+1'))  -- causes K_EVENT key
+    eq({mode='vs', blocking=false}, meths.get_mode()) -- still in ctrl-o mode
+    feed('^')
+    eq({mode='s', blocking=false}, meths.get_mode()) -- left ctrl-o mode
+    feed('h')
+    eq({mode='i', blocking=false}, meths.get_mode()) -- entered insert mode
+    expect('h') -- selection is the whole line and is replaced
+  end)
+end)