Merge remote-tracking branch 'upstream/master' into colorcolchar

4 files changed, 6 insertions, 4 deletions

diff --git a/src/nvim/generators/gen_api_ui_events.lua b/src/nvim/generators/gen_api_ui_events.lua
index f9e888c20d..ea66be7ee8 100755
--- a/src/nvim/generators/gen_api_ui_events.lua
+++ b/src/nvim/generators/gen_api_ui_events.lua
@@ -75,6 +75,8 @@ local function call_ui_event_method(output, ev)
       hlattrs_args_count = hlattrs_args_count + 1
     elseif kind == 'Object' then
       output:write('args.items['..(j-1)..'];\n')
+    elseif kind == 'Window' then
+      output:write('(Window)args.items['..(j-1)..'].data.integer;\n')
     else
       output:write('args.items['..(j-1)..'].data.'..string.lower(kind)..';\n')
     end
diff --git a/src/nvim/generators/gen_declarations.lua b/src/nvim/generators/gen_declarations.lua
index c7d5a1a191..bf1adaeee3 100755
--- a/src/nvim/generators/gen_declarations.lua
+++ b/src/nvim/generators/gen_declarations.lua
@@ -218,7 +218,7 @@ local footer = [[
 
 local non_static = header .. [[
 #ifndef DLLEXPORT
-#  ifdef WIN32
+#  ifdef MSWIN
 #    define DLLEXPORT __declspec(dllexport)
 #  else
 #    define DLLEXPORT
diff --git a/src/nvim/generators/gen_options.lua b/src/nvim/generators/gen_options.lua
index 0454c54faf..6dba6552b3 100644
--- a/src/nvim/generators/gen_options.lua
+++ b/src/nvim/generators/gen_options.lua
@@ -34,7 +34,6 @@ local redraw_flags={
   current_window_only='P_RWINONLY',
   current_buffer='P_RBUF',
   all_windows='P_RALL',
-  everything='P_RCLR',
   curswant='P_CURSWANT',
   ui_option='P_UI_OPTION',
 }
@@ -115,7 +114,7 @@ local value_dumpers = {
 }
 
 local get_value = function(v)
-  return '(char_u *) ' .. value_dumpers[type(v)](v)
+  return '(char *) ' .. value_dumpers[type(v)](v)
 end
 
 local get_defaults = function(d,n)
diff --git a/src/nvim/generators/gen_unicode_tables.lua b/src/nvim/generators/gen_unicode_tables.lua
index 36553f4649..9ad99c8029 100644
--- a/src/nvim/generators/gen_unicode_tables.lua
+++ b/src/nvim/generators/gen_unicode_tables.lua
@@ -153,7 +153,8 @@ local build_combining_table = function(ut_fp, dataprops)
   local start = -1
   local end_ = -1
   for _, p in ipairs(dataprops) do
-    if (({Mn=true, Mc=true, Me=true})[p[3]]) then
+    -- The 'Mc' property was removed, it does take up space.
+    if (({Mn=true, Me=true})[p[3]]) then
       local n = tonumber(p[1], 16)
       if start >= 0 and end_ + 1 == n then
         -- Continue with the same range.