options: remove 'maxcombine` option (always use 6)

2 files changed, 16 insertions, 4 deletions

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)
diff --git a/test/functional/ui/fold_spec.lua b/test/functional/ui/fold_spec.lua
index 40089d217d..9c5a59b58d 100644
--- a/test/functional/ui/fold_spec.lua
+++ b/test/functional/ui/fold_spec.lua
@@ -27,9 +27,8 @@ describe("folded lines", function()
   end)
 
   it("works with multibyte text", function()
-    -- Soon, we will always use the maximum value of 'maxcombine'.
-    feed_command("set maxcombine=6")
-
+    -- Currently the only allowed value of 'maxcombine'
+    eq(6, meths.get_option('maxcombine'))
     eq(true, meths.get_option('arabicshape'))
     insert([[
       å 语 x̨̣̘̫̲͚͎̎͂̀̂͛͛̾͢͟ العَرَبِيَّة