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

1 files changed, 25 insertions, 18 deletions

diff --git a/src/nvim/ex_docmd.h b/src/nvim/ex_docmd.h
index 19dd9e96ca..698153e8df 100644
--- a/src/nvim/ex_docmd.h
+++ b/src/nvim/ex_docmd.h
@@ -1,36 +1,44 @@
-#ifndef NVIM_EX_DOCMD_H
-#define NVIM_EX_DOCMD_H
+#pragma once
 
 #include <stdbool.h>
 
-#include "nvim/buffer_defs.h"
-#include "nvim/ex_cmds_defs.h"
+#include "nvim/buffer_defs.h"  // IWYU pragma: keep
+#include "nvim/cmdexpand_defs.h"  // IWYU pragma: keep
+#include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
+#include "nvim/getchar_defs.h"
 #include "nvim/globals.h"
+#include "nvim/types_defs.h"  // IWYU pragma: keep
 
-// flags for do_cmdline()
-#define DOCMD_VERBOSE   0x01      // included command in error message
-#define DOCMD_NOWAIT    0x02      // don't call wait_return() and friends
-#define DOCMD_REPEAT    0x04      // repeat exec. until getline() returns NULL
-#define DOCMD_KEYTYPED  0x08      // don't reset KeyTyped
-#define DOCMD_EXCRESET  0x10      // reset exception environment (for debugging
-#define DOCMD_KEEPLINE  0x20      // keep typed line for repeating with "."
+/// flags for do_cmdline()
+enum {
+  DOCMD_VERBOSE  = 0x01,  ///< included command in error message
+  DOCMD_NOWAIT   = 0x02,  ///< don't call wait_return() and friends
+  DOCMD_REPEAT   = 0x04,  ///< repeat exec. until getline() returns NULL
+  DOCMD_KEYTYPED = 0x08,  ///< don't reset KeyTyped
+  DOCMD_EXCRESET = 0x10,  ///< reset exception environment (for debugging
+  DOCMD_KEEPLINE = 0x20,  ///< keep typed line for repeating with "."
+};
 
-// defines for eval_vars()
-#define VALID_PATH              1
-#define VALID_HEAD              2
+/// defines for eval_vars()
+enum {
+  VALID_PATH = 1,
+  VALID_HEAD = 2,
+};
 
 // Whether a command index indicates a user command.
 #define IS_USER_CMDIDX(idx) ((int)(idx) < 0)
 
-// Structure used to save the current state.  Used when executing Normal mode
-// commands while in any other mode.
+enum { DIALOG_MSG_SIZE = 1000, };  ///< buffer size for dialog_msg()
+
+/// Structure used to save the current state.  Used when executing Normal mode
+/// commands while in any other mode.
 typedef struct {
   int save_msg_scroll;
   int save_restart_edit;
   bool save_msg_didout;
   int save_State;
   bool save_finish_op;
-  long save_opcount;
+  int save_opcount;
   int save_reg_executing;
   bool save_pending_end_reg_executing;
   tasave_T tabuf;
@@ -39,4 +47,3 @@ typedef struct {
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ex_docmd.h.generated.h"
 #endif
-#endif  // NVIM_EX_DOCMD_H