1 files changed, 10 insertions, 19 deletions
diff --git a/src/nvim/generators/gen_ex_cmds.lua b/src/nvim/generators/gen_ex_cmds.lua
index 0c1051b04e..ae8c952648 100644
--- a/src/nvim/generators/gen_ex_cmds.lua
+++ b/src/nvim/generators/gen_ex_cmds.lua
@@ -1,20 +1,8 @@
-local nvimsrcdir = arg[1]
-local includedir = arg[2]
-local autodir = arg[3]
+local includedir = arg[1]
+local autodir = arg[2]
 
-if nvimsrcdir == '--help' then
-  print ([[
-Usage:
-  lua genex_cmds.lua src/nvim build/include build/src/nvim/auto
-
-Will generate files build/include/ex_cmds_enum.generated.h with cmdidx_T
-enum and build/src/nvim/auto/ex_cmds_defs.generated.h with main Ex commands
-definitions.
-]])
-  os.exit(0)
-end
-
-package.path = nvimsrcdir .. '/?.lua;' .. package.path
+-- Will generate files ex_cmds_enum.generated.h with cmdidx_T enum
+-- and ex_cmds_defs.generated.h with main Ex commands definitions.
 
 local enumfname = includedir .. '/ex_cmds_enum.generated.h'
 local defsfname = autodir .. '/ex_cmds_defs.generated.h'
@@ -41,11 +29,13 @@ static const uint16_t cmdidxs1[%u] = {
 -- Values in cmdidxs2[c1][c2] are relative to cmdidxs1[c1] so that they
 -- fit in a byte.
 local cmdidxs2_out = string.format([[
-static const char_u cmdidxs2[%u][%u] = {
+static const uint8_t cmdidxs2[%u][%u] = {
   /*           a   b   c   d   e   f   g   h   i   j   k   l   m   n   o   p   q   r   s   t   u   v   w   x   y   z */
 ]], a_to_z, a_to_z)
 
 enumfile:write([[
+// IWYU pragma: private, include "nvim/ex_cmds_defs.h"
+
 typedef enum CMD_index {
 ]])
 defsfile:write(string.format([[
@@ -66,8 +56,8 @@ defsfile:write(string.format([[
 #include "nvim/ex_session.h"
 #include "nvim/help.h"
 #include "nvim/indent.h"
-#include "nvim/locale.h"
 #include "nvim/lua/executor.h"
+#include "nvim/lua/secure.h"
 #include "nvim/mapping.h"
 #include "nvim/mark.h"
 #include "nvim/match.h"
@@ -75,6 +65,7 @@ defsfile:write(string.format([[
 #include "nvim/message.h"
 #include "nvim/ops.h"
 #include "nvim/option.h"
+#include "nvim/os/lang.h"
 #include "nvim/profile.h"
 #include "nvim/quickfix.h"
 #include "nvim/runtime.h"
@@ -113,7 +104,7 @@ for _, cmd in ipairs(defs) do
   end
   local preview_func
   if cmd.preview_func then
-    preview_func = string.format("(ex_preview_func_T)&%s", cmd.preview_func)
+    preview_func = string.format("&%s", cmd.preview_func)
   else
     preview_func = "NULL"
   end