Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar

1 files changed, 22 insertions, 0 deletions

diff --git a/test/functional/ui/mode_spec.lua b/test/functional/ui/mode_spec.lua
index cf4eb034e0..e870d6f25f 100644
--- a/test/functional/ui/mode_spec.lua
+++ b/test/functional/ui/mode_spec.lua
@@ -44,7 +44,10 @@ describe('ui mode_change event', function()
       {0:~                        }|
                                |
     ]], mode="normal"}
+  end)
 
+  -- oldtest: Test_mouse_shape_after_failed_change()
+  it('is restored to Normal mode after failed "c"', function()
     screen:try_resize(50, 4)
     command('set nomodifiable')
 
@@ -65,6 +68,25 @@ describe('ui mode_change event', function()
     ]], mode="normal"}
   end)
 
+  -- oldtest: Test_mouse_shape_after_cancelling_gr()
+  it('is restored to Normal mode after cancelling "gr"', function()
+    feed('gr')
+    screen:expect{grid=[[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]], mode="replace"}
+
+    feed('<Esc>')
+    screen:expect{grid=[[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]], mode="normal"}
+  end)
+
   it('works in insert mode', function()
     feed('i')
     screen:expect{grid=[[