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

1 files changed, 14 insertions, 19 deletions

diff --git a/test/functional/ui/options_spec.lua b/test/functional/ui/options_spec.lua
index 9d20229ce1..2c649709c6 100644
--- a/test/functional/ui/options_spec.lua
+++ b/test/functional/ui/options_spec.lua
@@ -19,9 +19,11 @@ describe('UI receives option updates', function()
       linespace=0,
       pumblend=0,
       mousefocus=false,
+      mousehide=true,
       mousemoveevent=false,
       showtabline=1,
       termguicolors=false,
+      termsync=true,
       ttimeout=true,
       ttimeoutlen=50,
       verbose=0,
@@ -68,15 +70,18 @@ describe('UI receives option updates', function()
       eq({'mouse_on'}, evs)
     end)
     command("set mouse=")
+    screen:expect(function()
+      eq({'mouse_on', 'mouse_off'}, evs)
+    end)
     command("set mouse&")
     screen:expect(function()
-      eq({'mouse_on','mouse_off', 'mouse_on'}, evs)
+      eq({'mouse_on', 'mouse_off', 'mouse_on'}, evs)
     end)
     screen:detach()
-    eq({'mouse_on','mouse_off', 'mouse_on'}, evs)
+    eq({'mouse_on', 'mouse_off', 'mouse_on'}, evs)
     screen:attach()
     screen:expect(function()
-      eq({'mouse_on','mouse_off','mouse_on', 'mouse_on'}, evs)
+      eq({'mouse_on', 'mouse_off', 'mouse_on', 'mouse_on'}, evs)
     end)
   end)
 
@@ -133,6 +138,12 @@ describe('UI receives option updates', function()
       eq(expected, screen.options)
     end)
 
+    command("set nomousehide")
+    expected.mousehide = false
+    screen:expect(function()
+      eq(expected, screen.options)
+    end)
+
     command("set mousemoveevent")
     expected.mousemoveevent = true
     screen:expect(function()
@@ -200,22 +211,6 @@ describe('UI can set terminal option', function()
     screen = Screen.new(20,5)
   end)
 
-  it('term_background', function()
-    eq('dark', eval '&background')
-
-    screen:attach {term_background='light'}
-    eq('light', eval '&background')
-  end)
-
-  it("term_background but not if 'background' already set by user", function()
-    eq('dark', eval '&background')
-    command 'set background=dark'
-
-    screen:attach {term_background='light'}
-
-    eq('dark', eval '&background')
-  end)
-
   it('term_name', function()
     eq('nvim', eval '&term')