Merge branch 'master' into s-dash-stdin

1 files changed, 15 insertions, 3 deletions

diff --git a/test/functional/legacy/036_regexp_character_classes_spec.lua b/test/functional/legacy/036_regexp_character_classes_spec.lua
index 15287b9901..38e8145d1c 100644
--- a/test/functional/legacy/036_regexp_character_classes_spec.lua
+++ b/test/functional/legacy/036_regexp_character_classes_spec.lua
@@ -1,7 +1,7 @@
 -- Test character classes in regexp using regexpengine 0, 1, 2.
 
 local helpers = require('test.functional.helpers')(after_each)
-local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
+local clear, command, expect = helpers.clear, helpers.command, helpers.expect
 local source, write_file = helpers.source, helpers.write_file
 
 local function sixlines(text)
@@ -14,7 +14,7 @@ end
 
 local function diff(text, nodedent)
   local fname = helpers.tmpname()
-  execute('w! '..fname)
+  command('w! '..fname)
   helpers.wait()
   local data = io.open(fname):read('*all')
   if nodedent then
@@ -45,7 +45,7 @@ describe('character classes in regexp', function()
   end)
   before_each(function()
     clear()
-    execute('e test36.in')
+    command('e test36.in')
   end)
   teardown(function()
     os.remove('test36.in')
@@ -275,4 +275,16 @@ describe('character classes in regexp', function()
     diff(sixlines(string.sub(punct1, 1)..digits..punct2..upper..punct3..
       lower..punct4..ctrl2..iso_text))
   end)
+  it('does not convert character class ranges to an incorrect class', function()
+    source([[
+      1 s/\%#=0[0-z]//g
+      2 s/\%#=1[0-z]//g
+      3 s/\%#=2[0-z]//g
+      4 s/\%#=0[^0-z]//g
+      5 s/\%#=1[^0-z]//g
+      6 s/\%#=2[^0-z]//g
+    ]])
+    diff(string.rep(ctrl1..punct1..punct4..ctrl2..iso_text..'\n', 3)
+      ..string.rep(digits..punct2..upper..punct3..lower..'\n', 3))
+  end)
 end)