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

1 files changed, 30 insertions, 23 deletions

diff --git a/src/nvim/edit.h b/src/nvim/edit.h
index 91c519f015..434b653f7b 100644
--- a/src/nvim/edit.h
+++ b/src/nvim/edit.h
@@ -1,32 +1,39 @@
-#ifndef NVIM_EDIT_H
-#define NVIM_EDIT_H
+#pragma once
 
-#include "nvim/autocmd.h"
-#include "nvim/vim.h"
+#include "nvim/autocmd_defs.h"  // IWYU pragma: keep
+#include "nvim/buffer_defs.h"  // IWYU pragma: keep
+#include "nvim/pos_defs.h"  // IWYU pragma: keep
 
-// Values for in_cinkeys()
-#define KEY_OPEN_FORW   0x101
-#define KEY_OPEN_BACK   0x102
-#define KEY_COMPLETE    0x103   // end of completion
+/// Values for in_cinkeys()
+enum {
+  KEY_OPEN_FORW = 0x101,
+  KEY_OPEN_BACK = 0x102,
+  KEY_COMPLETE  = 0x103,  ///< end of completion
+};
 
-// Values for change_indent()
-#define INDENT_SET      1       // set indent
-#define INDENT_INC      2       // increase indent
-#define INDENT_DEC      3       // decrease indent
+/// Values for change_indent()
+enum {
+  INDENT_SET = 1,  ///< set indent
+  INDENT_INC = 2,  ///< increase indent
+  INDENT_DEC = 3,  ///< decrease indent
+};
 
-// flags for beginline()
-#define BL_WHITE        1       // cursor on first non-white in the line
-#define BL_SOL          2       // use 'sol' option
-#define BL_FIX          4       // don't leave cursor on a NUL
+/// flags for beginline()
+enum {
+  BL_WHITE = 1,  ///< cursor on first non-white in the line
+  BL_SOL   = 2,  ///< use 'sol' option
+  BL_FIX   = 4,  ///< don't leave cursor on a NUL
+};
 
-// flags for insertchar()
-#define INSCHAR_FORMAT  1       // force formatting
-#define INSCHAR_DO_COM  2       // format comments
-#define INSCHAR_CTRLV   4       // char typed just after CTRL-V
-#define INSCHAR_NO_FEX  8       // don't use 'formatexpr'
-#define INSCHAR_COM_LIST 16     // format comments with list/2nd line indent
+/// flags for insertchar()
+enum {
+  INSCHAR_FORMAT   = 1,   ///< force formatting
+  INSCHAR_DO_COM   = 2,   ///< format comments
+  INSCHAR_CTRLV    = 4,   ///< char typed just after CTRL-V
+  INSCHAR_NO_FEX   = 8,   ///< don't use 'formatexpr'
+  INSCHAR_COM_LIST = 16,  ///< format comments with list/2nd line indent
+};
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "edit.h.generated.h"
 #endif
-#endif  // NVIM_EDIT_H