Merge pull request #17932 from zeertzjq/vim-8.1.2145

vim-patch:8.1.{2145,2159,2165,2167,2333,2346,2350},8.2.{0839,0851,0855,0867,0916,0919,2084,2728,3595,4504,4819,4824,4827,4828,4829,4833,4837}

1 files changed, 12 insertions, 11 deletions

diff --git a/test/unit/keymap_spec.lua b/test/unit/keymap_spec.lua
index 595a19eb17..1f1f32bb9e 100644
--- a/test/unit/keymap_spec.lua
+++ b/test/unit/keymap_spec.lua
@@ -5,7 +5,8 @@ local ffi     = helpers.ffi
 local eq      = helpers.eq
 local neq     = helpers.neq
 
-local keymap = helpers.cimport("./src/nvim/keymap.h")
+local keymap = helpers.cimport('./src/nvim/keymap.h')
+local NULL = helpers.NULL
 
 describe('keymap.c', function()
 
@@ -15,12 +16,12 @@ describe('keymap.c', function()
 
     itp('no keycode', function()
       srcp[0] = 'abc'
-      eq(0, keymap.find_special_key(srcp, 3, modp, false, false, false))
+      eq(0, keymap.find_special_key(srcp, 3, modp, 0, NULL))
     end)
 
     itp('keycode with multiple modifiers', function()
       srcp[0] = '<C-M-S-A>'
-      neq(0, keymap.find_special_key(srcp, 9, modp, false, false, false))
+      neq(0, keymap.find_special_key(srcp, 9, modp, 0, NULL))
       neq(0, modp[0])
     end)
 
@@ -28,22 +29,22 @@ describe('keymap.c', function()
       -- Compare other capitalizations to this.
       srcp[0] = '<C-A>'
       local all_caps_key =
-          keymap.find_special_key(srcp, 5, modp, false, false, false)
+          keymap.find_special_key(srcp, 5, modp, 0, NULL)
       local all_caps_mod = modp[0]
 
       srcp[0] = '<C-a>'
       eq(all_caps_key,
-         keymap.find_special_key(srcp, 5, modp, false, false, false))
+         keymap.find_special_key(srcp, 5, modp, 0, NULL))
       eq(all_caps_mod, modp[0])
 
       srcp[0] = '<c-A>'
       eq(all_caps_key,
-         keymap.find_special_key(srcp, 5, modp, false, false, false))
+         keymap.find_special_key(srcp, 5, modp, 0, NULL))
       eq(all_caps_mod, modp[0])
 
       srcp[0] = '<c-a>'
       eq(all_caps_key,
-         keymap.find_special_key(srcp, 5, modp, false, false, false))
+         keymap.find_special_key(srcp, 5, modp, 0, NULL))
       eq(all_caps_mod, modp[0])
     end)
 
@@ -51,20 +52,20 @@ describe('keymap.c', function()
       -- Unescaped with in_string=false
       srcp[0] = '<C-">'
       eq(string.byte('"'),
-         keymap.find_special_key(srcp, 5, modp, false, false, false))
+         keymap.find_special_key(srcp, 5, modp, 0, NULL))
 
       -- Unescaped with in_string=true
-      eq(0, keymap.find_special_key(srcp, 5, modp, false, false, true))
+      eq(0, keymap.find_special_key(srcp, 5, modp, keymap.FSK_IN_STRING, NULL))
 
       -- Escaped with in_string=false
       srcp[0] = '<C-\\">'
       -- Should fail because the key is invalid
       -- (more than 1 non-modifier character).
-      eq(0, keymap.find_special_key(srcp, 6, modp, false, false, false))
+      eq(0, keymap.find_special_key(srcp, 6, modp, 0, NULL))
 
       -- Escaped with in_string=true
       eq(string.byte('"'),
-         keymap.find_special_key(srcp, 6, modp, false, false, true))
+         keymap.find_special_key(srcp, 6, modp, keymap.FSK_IN_STRING, NULL))
     end)
   end)