2 files changed, 88 insertions, 29 deletions
diff --git a/test/functional/legacy/057_sort_spec.lua b/test/functional/legacy/057_sort_spec.lua
index 65defbae96..7eed31e292 100644
--- a/test/functional/legacy/057_sort_spec.lua
+++ b/test/functional/legacy/057_sort_spec.lua
@@ -600,39 +600,72 @@ describe(':sort', function()
     eq('Vim(sort):E474: Invalid argument', eval('tmpvar'))
     expect(text)
   end)
-  
+
   it('binary', function()
     insert([[
-    0b111000
-    0b101100
-    0b101001
-    0b101001
-    0b101000
-    0b000000
-    0b001000
-    0b010000
-    0b101000
-    0b100000
-    0b101010
-    0b100010
-    0b100100
-    0b100010]])
+      0b111000
+      0b101100
+      0b101001
+      0b101001
+      0b101000
+      0b000000
+      0b001000
+      0b010000
+      0b101000
+      0b100000
+      0b101010
+      0b100010
+      0b100100
+      0b100010]])
     execute([[sort b]])
     expect([[
-    0b000000
-    0b001000
-    0b010000
-    0b100000
-    0b100010
-    0b100010
-    0b100100
-    0b101000
-    0b101000
-    0b101001
-    0b101001
-    0b101010
-    0b101100
-    0b111000]])
+      0b000000
+      0b001000
+      0b010000
+      0b100000
+      0b100010
+      0b100010
+      0b100100
+      0b101000
+      0b101000
+      0b101001
+      0b101001
+      0b101010
+      0b101100
+      0b111000]])
   end)
 
+  it('binary with leading characters', function()
+    insert([[
+      0b100010
+      0b010000
+       0b101001
+      b0b101100
+      0b100010
+       0b100100
+      a0b001000
+      0b101000
+      0b101000
+      a0b101001
+      ab0b100000
+      0b101010
+      0b000000
+      b0b111000]])
+    execute([[sort b]])
+    expect([[
+      0b000000
+      a0b001000
+      0b010000
+      ab0b100000
+      0b100010
+      0b100010
+       0b100100
+      0b101000
+      0b101000
+       0b101001
+      a0b101001
+      0b101010
+      b0b101100
+      b0b111000]])
+  end)
 end)
diff --git a/test/functional/legacy/059_utf8_spell_checking_spec.lua b/test/functional/legacy/059_utf8_spell_checking_spec.lua
index ac2c7e6a35..63df387be3 100644
--- a/test/functional/legacy/059_utf8_spell_checking_spec.lua
+++ b/test/functional/legacy/059_utf8_spell_checking_spec.lua
@@ -307,6 +307,13 @@ describe("spell checking with 'encoding' set to utf-8", function()
       bar
       faabar
       ]])
+    write_latin1('Xtest9.aff', [[
+      ]])
+    write_latin1('Xtest9.dic', [[
+      1234
+      foo
+      bar
+      ]])
     write_latin1('Xtest-sal.aff', [[
       SET ISO8859-1
       TRY esianrtolcdugmphbyfvkwjkqxz-ëéèêïîäàâöüû'ESIANRTOLCDUGMPHBYFVKWJKQXZ
@@ -490,6 +497,8 @@ describe("spell checking with 'encoding' set to utf-8", function()
     os.remove('Xtest7.dic')
     os.remove('Xtest8.aff')
     os.remove('Xtest8.dic')
+    os.remove('Xtest9.aff')
+    os.remove('Xtest9.dic')
   end)
 
   -- Function to test .aff/.dic with list of good and bad words.  This was a
@@ -972,4 +981,21 @@ describe("spell checking with 'encoding' set to utf-8", function()
       barfoo
       ['bar foo', 'bar', 'foo']]=])
   end)
+
+  it('part 9-9', function()
+    insert([[
+      9good: 0b1011 0777 1234 0x01ff
+      badend
+      ]])
+    -- NOSPLITSUGS
+    test_one(9, 9)
+    -- Assert buffer contents.
+    execute('1,/^test 9-9/-1d')
+    expect([=[
+      test 9-9
+      # file: Xtest.utf-8.spl
+      bar
+      foo
+      -------]=])
+  end)
 end)