2 files changed, 15 insertions, 4 deletions
diff --git a/src/nvim/generators/gen_api_dispatch.lua b/src/nvim/generators/gen_api_dispatch.lua
index 21f8c3855e..c6dd25154b 100644
--- a/src/nvim/generators/gen_api_dispatch.lua
+++ b/src/nvim/generators/gen_api_dispatch.lua
@@ -441,8 +441,8 @@ local function process_function(fn)
     local cparam = string.format('arg%u', j)
     local param_type = real_type(param[1])
     local lc_param_type = real_type(param[1]):lower()
-    local extra = ((param_type == "Object" or param_type == "Dictionary") and "false, ") or ""
-    if param[1] == "DictionaryOf(LuaRef)" then
+    local extra = param_type == "Dictionary" and "false, " or ""
+    if param[1] == "Object" or param[1] == "DictionaryOf(LuaRef)" then
       extra = "true, "
     end
     local errshift = 0
diff --git a/src/nvim/generators/gen_keysets.lua b/src/nvim/generators/gen_keysets.lua
index 63ef202fe1..01d8c1d357 100644
--- a/src/nvim/generators/gen_keysets.lua
+++ b/src/nvim/generators/gen_keysets.lua
@@ -26,6 +26,17 @@ local defspipe = io.open(defs_file, 'wb')
 
 local keysets = require'api.keysets'
 
+local keywords = {
+  register = true,
+}
+
+local function sanitize(key)
+  if keywords[key] then
+    return key .. "_"
+  end
+  return key
+end
+
 for name, keys in pairs(keysets) do
   local neworder, hashfun = hashy.hashy_hash(name, keys, function (idx)
     return name.."_table["..idx.."].str"
@@ -33,7 +44,7 @@ for name, keys in pairs(keysets) do
 
   defspipe:write("typedef struct {\n")
   for _, key in ipairs(neworder) do
-    defspipe:write("  Object "..key..";\n")
+    defspipe:write("  Object "..sanitize(key)..";\n")
   end
   defspipe:write("} KeyDict_"..name..";\n\n")
 
@@ -41,7 +52,7 @@ for name, keys in pairs(keysets) do
 
   funcspipe:write("KeySetLink "..name.."_table[] = {\n")
   for _, key in ipairs(neworder) do
-    funcspipe:write('  {"'..key..'", offsetof(KeyDict_'..name..", "..key..")},\n")
+    funcspipe:write('  {"'..key..'", offsetof(KeyDict_'..name..", "..sanitize(key)..")},\n")
   end
     funcspipe:write('  {NULL, 0},\n')
   funcspipe:write("};\n\n")