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

1 files changed, 17 insertions, 17 deletions

diff --git a/src/nvim/usercmd.h b/src/nvim/usercmd.h
index b6bf6c1e33..bcabf9460b 100644
--- a/src/nvim/usercmd.h
+++ b/src/nvim/usercmd.h
@@ -1,28 +1,29 @@
-#ifndef NVIM_USERCMD_H
-#define NVIM_USERCMD_H
+#pragma once
 
+#include <stddef.h>  // IWYU pragma: keep
 #include <stdint.h>
 
+#include "nvim/cmdexpand_defs.h"  // IWYU pragma: keep
 #include "nvim/eval/typval_defs.h"
 #include "nvim/ex_cmds_defs.h"
-#include "nvim/garray.h"
-#include "nvim/types.h"
+#include "nvim/garray_defs.h"
+#include "nvim/types_defs.h"  // IWYU pragma: keep
 
 typedef struct ucmd {
-  char *uc_name;                // The command name
-  uint32_t uc_argt;             // The argument type
-  char *uc_rep;                 // The command's replacement string
-  long uc_def;                  // The default value for a range/count
-  int uc_compl;                 // completion type
-  cmd_addr_T uc_addr_type;      // The command's address type
-  sctx_T uc_script_ctx;         // SCTX where the command was defined
-  char *uc_compl_arg;           // completion argument if any
-  LuaRef uc_compl_luaref;       // Reference to Lua completion function
-  LuaRef uc_preview_luaref;     // Reference to Lua preview function
-  LuaRef uc_luaref;             // Reference to Lua function
+  char *uc_name;             ///< The command name
+  uint32_t uc_argt;          ///< The argument type
+  char *uc_rep;              ///< The command's replacement string
+  int64_t uc_def;            ///< The default value for a range/count
+  int uc_compl;              ///< completion type
+  cmd_addr_T uc_addr_type;   ///< The command's address type
+  sctx_T uc_script_ctx;      ///< SCTX where the command was defined
+  char *uc_compl_arg;        ///< completion argument if any
+  LuaRef uc_compl_luaref;    ///< Reference to Lua completion function
+  LuaRef uc_preview_luaref;  ///< Reference to Lua preview function
+  LuaRef uc_luaref;          ///< Reference to Lua function
 } ucmd_T;
 
-#define UC_BUFFER       1       // -buffer: local to current buffer
+enum { UC_BUFFER = 1, };  ///< -buffer: local to current buffer
 
 extern garray_T ucmds;
 
@@ -32,4 +33,3 @@ extern garray_T ucmds;
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "usercmd.h.generated.h"
 #endif
-#endif  // NVIM_USERCMD_H