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

1 files changed, 28 insertions, 5 deletions

diff --git a/test/functional/ui/options_spec.lua b/test/functional/ui/options_spec.lua
index 93192934c7..581e196bbb 100644
--- a/test/functional/ui/options_spec.lua
+++ b/test/functional/ui/options_spec.lua
@@ -5,7 +5,7 @@ local command = helpers.command
 local eq = helpers.eq
 local shallowcopy = helpers.shallowcopy
 
-describe('ui receives option updates', function()
+describe('UI receives option updates', function()
   local screen
 
   local function reset(opts, ...)
@@ -40,10 +40,6 @@ describe('ui receives option updates', function()
     return defaults
   end
 
-  after_each(function()
-    screen:detach()
-  end)
-
   it("for defaults", function()
     local expected = reset()
     screen:expect(function()
@@ -51,6 +47,33 @@ describe('ui receives option updates', function()
     end)
   end)
 
+  it('on attach #11372', function()
+    clear()
+    local evs = {}
+    screen = Screen.new(20,5)
+    -- Override mouse_on/mouse_off handlers.
+    function screen:_handle_mouse_on()
+      table.insert(evs, 'mouse_on')
+    end
+    function screen:_handle_mouse_off()
+      table.insert(evs, 'mouse_off')
+    end
+    screen:attach()
+    screen:expect(function()
+      eq({'mouse_off'}, evs)
+    end)
+    command("set mouse=nvi")
+    screen:expect(function()
+      eq({'mouse_off','mouse_on'}, evs)
+    end)
+    screen:detach()
+    eq({'mouse_off','mouse_on'}, evs)
+    screen:attach()
+    screen:expect(function()
+      eq({'mouse_off','mouse_on','mouse_on'}, evs)
+    end)
+  end)
+
   it("when setting options", function()
     local expected = reset()
     local defaults = shallowcopy(expected)