2 files changed, 80 insertions, 1 deletions
diff --git a/test/functional/options/fillchars_spec.lua b/test/functional/options/fillchars_spec.lua
new file mode 100644
index 0000000000..ab61935d4c
--- /dev/null
+++ b/test/functional/options/fillchars_spec.lua
@@ -0,0 +1,66 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local clear, command = helpers.clear, helpers.command
+local eval = helpers.eval
+local eq = helpers.eq
+local exc_exec = helpers.exc_exec
+
+describe("'fillchars'", function()
+  local screen
+
+  before_each(function()
+    clear()
+    screen = Screen.new(25, 5)
+    screen:attach()
+  end)
+
+  after_each(function()
+    screen:detach()
+  end)
+
+  local function shouldfail(val,errval)
+    errval = errval or val
+    eq('Vim(set):E474: Invalid argument: fillchars='..errval,
+       exc_exec('set fillchars='..val))
+  end
+
+  describe('"eob" flag', function()
+    it("uses '~' by default", function()
+      eq('', eval('&fillchars'))
+      screen:expect([[
+        ^                         |
+        ~                        |
+        ~                        |
+        ~                        |
+                                 |
+      ]])
+    end)
+    it('supports whitespace', function()
+      command('set fillchars=eob:\\ ')
+      screen:expect([[
+        ^                         |
+                                 |
+                                 |
+                                 |
+                                 |
+      ]])
+    end)
+    it('supports multibyte char', function()
+      command('set fillchars=eob:ñ')
+      screen:expect([[
+        ^                         |
+        ñ                        |
+        ñ                        |
+        ñ                        |
+                                 |
+      ]])
+    end)
+    it('handles invalid values', function()
+      shouldfail('eob:') -- empty string
+      shouldfail('eob:馬') -- doublewidth char
+      shouldfail('eob:å̲') -- composing chars
+      shouldfail('eob:xy') -- two ascii chars
+      shouldfail('eob:\255', 'eob:<ff>') -- invalid UTF-8
+    end)
+  end)
+end)
diff --git a/test/functional/options/num_options_spec.lua b/test/functional/options/num_options_spec.lua
index ed17ffdd3c..fb0559054d 100644
--- a/test/functional/options/num_options_spec.lua
+++ b/test/functional/options/num_options_spec.lua
@@ -51,7 +51,6 @@ describe(':set validation', function()
     should_succeed('winminheight', 0)
     should_fail('winwidth', 0, 'E487')
     should_fail('helpheight', -1, 'E487')
-    should_fail('maxcombine', 7, 'E474')
     should_fail('iminsert', 3, 'E474')
     should_fail('imsearch', 3, 'E474')
     should_fail('titlelen', -1, 'E487')
@@ -94,4 +93,18 @@ describe(':set validation', function()
     feed_command('set winminwidth=3')
     eq('E592', eval("v:errmsg"):match("E%d*"))
   end)
+
+  it('set maxcombine resets to 6', function()
+    local function setto(value)
+      feed_command('setglobal maxcombine=' .. value)
+      feed_command('setlocal maxcombine=' .. value)
+      meths.set_option('maxcombine', value)
+      eq(6, meths.get_option('maxcombine'))
+      eq('', eval("v:errmsg"))
+    end
+    setto(0)
+    setto(1)
+    setto(6)
+    setto(7)
+  end)
 end)