3 files changed, 98 insertions, 1 deletions
diff --git a/test/functional/legacy/autocmd_option_spec.lua b/test/functional/legacy/autocmd_option_spec.lua
index 855e9c6271..6349371808 100644
--- a/test/functional/legacy/autocmd_option_spec.lua
+++ b/test/functional/legacy/autocmd_option_spec.lua
@@ -2,6 +2,8 @@ local helpers = require('test.functional.helpers')
 local nvim = helpers.meths
 local clear, eq, neq = helpers.clear, helpers.eq, helpers.neq
 local curbuf, buf = helpers.curbuf, helpers.bufmeths
+local curwin = helpers.curwin
+local redir_exec = helpers.redir_exec
 local source, execute = helpers.source, helpers.execute
 
 local function declare_hook_function()
@@ -86,7 +88,7 @@ end
 
 local function make_buffer()
   local old_buf = curbuf()
-  execute('new')
+  execute('botright new')
   local new_buf = curbuf()
   execute('wincmd p') -- move previous window
 
@@ -96,6 +98,19 @@ local function make_buffer()
   return new_buf
 end
 
+local function get_new_window_number()
+  local old_win = curwin()
+  execute('botright new')
+  local new_win = curwin()
+  local new_winnr = redir_exec('echo winnr()')
+  execute('wincmd p') -- move previous window
+
+  neq(old_win, new_win)
+  eq(old_win, curwin())
+
+  return new_winnr:gsub('\n', '')
+end
+
 describe('au OptionSet', function()
   describe('with any opton (*)', function()
 
@@ -248,6 +263,32 @@ describe('au OptionSet', function()
       end)
     end)
 
+    describe('being set by setwinvar()', function()
+      it('should not trigger because option name does not match with backup', function()
+        set_hook('backup')
+
+        execute('call setwinvar(1, "&l:bk", 1)')
+        expected_empty()
+      end)
+
+      it('should trigger, use correct option name backup', function()
+        set_hook('backup')
+
+        execute('call setwinvar(1, "&backup", 1)')
+        expected_combination({'backup', 0, 1, 'local'})
+      end)
+
+      it('should not trigger if the current window is different from the targetted window', function()
+        set_hook('cursorcolumn')
+
+        local new_winnr = get_new_window_number()
+
+        execute('call setwinvar(' .. new_winnr .. ', "&cursorcolumn", 1)')
+        -- expected_combination({'cursorcolumn', 0, 1, 'local', {winnr = new_winnr}})
+        expected_empty()
+      end)
+    end)
+
     describe('being set by neovim api', function()
       it('should trigger if a boolean option be set globally', function()
         set_hook('autochdir')
diff --git a/test/functional/legacy/charsearch_spec.lua b/test/functional/legacy/charsearch_spec.lua
new file mode 100644
index 0000000000..4a83801cfc
--- /dev/null
+++ b/test/functional/legacy/charsearch_spec.lua
@@ -0,0 +1,42 @@
+-- Test for character searches
+
+local helpers = require('test.functional.helpers')
+local feed, insert = helpers.feed, helpers.insert
+local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+
+describe('charsearch', function()
+  setup(clear)
+
+  it('is working', function()
+    insert([[
+      Xabcdefghijkemnopqretuvwxyz
+      Yabcdefghijkemnopqretuvwxyz
+      Zabcdefghijkemnokqretkvwxyz]])
+
+    -- Check that "fe" and ";" work.
+    execute('/^X')
+    feed('ylfep;;p,,p')
+    -- Check that save/restore works.
+    execute('/^Y')
+    feed('ylfep')
+    execute('let csave = getcharsearch()')
+    feed('fip')
+    execute('call setcharsearch(csave)')
+    feed(';p;p')
+    -- Check that setcharsearch() changes the settings.
+    execute('/^Z')
+    feed('ylfep')
+    execute("call setcharsearch({'char': 'k'})")
+    feed(';p')
+    execute("call setcharsearch({'forward': 0})")
+    feed('$;p')
+    execute("call setcharsearch({'until': 1})")
+    feed(';;p')
+
+    -- Assert buffer contents.
+    expect([[
+      XabcdeXfghijkeXmnopqreXtuvwxyz
+      YabcdeYfghiYjkeYmnopqreYtuvwxyz
+      ZabcdeZfghijkZZemnokqretkZvwxyz]])
+  end)
+end)
diff --git a/test/functional/legacy/comparators_spec.lua b/test/functional/legacy/comparators_spec.lua
new file mode 100644
index 0000000000..e3fa3eea23
--- /dev/null
+++ b/test/functional/legacy/comparators_spec.lua
@@ -0,0 +1,14 @@
+-- " Test for expression comparators.
+
+local helpers = require('test.functional.helpers')
+local clear, eq = helpers.clear, helpers.eq
+local eval, execute = helpers.eval, helpers.execute
+
+describe('comparators', function()
+  before_each(clear)
+
+  it('is working', function()
+    execute('set isident+=#')
+    eq(1, eval('1 is#1'))
+  end)
+end)