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

1 files changed, 10 insertions, 20 deletions

diff --git a/src/nvim/getchar.h b/src/nvim/getchar.h
index 6996b00c6e..177a021706 100644
--- a/src/nvim/getchar.h
+++ b/src/nvim/getchar.h
@@ -1,29 +1,20 @@
-#ifndef NVIM_GETCHAR_H
-#define NVIM_GETCHAR_H
+#pragma once
 
-#include "nvim/os/fileio.h"
-#include "nvim/vim.h"
+#include <stdbool.h>
+#include <stdint.h>
 
-/// Values for "noremap" argument of ins_typebuf()
-///
-/// Also used for map->m_noremap and menu->noremap[].
-enum RemapValues {
-  REMAP_YES = 0,  ///< Allow remapping.
-  REMAP_NONE = -1,  ///< No remapping.
-  REMAP_SCRIPT = -2,  ///< Remap script-local mappings only.
-  REMAP_SKIP = -3,  ///< No remapping for first char.
-};
+#include "nvim/eval/typval_defs.h"  // IWYU pragma: keep
+#include "nvim/getchar_defs.h"  // IWYU pragma: export
+#include "nvim/os/fileio.h"
+#include "nvim/types_defs.h"  // IWYU pragma: keep
 
-// Argument for flush_buffers().
+/// Argument for flush_buffers().
 typedef enum {
   FLUSH_MINIMAL,
-  FLUSH_TYPEAHEAD,  // flush current typebuf contents
-  FLUSH_INPUT,  // flush typebuf and inchar() input
+  FLUSH_TYPEAHEAD,  ///< flush current typebuf contents
+  FLUSH_INPUT,      ///< flush typebuf and inchar() input
 } flush_buffers_T;
 
-#define KEYLEN_PART_KEY (-1)  // keylen value for incomplete key-code
-#define KEYLEN_PART_MAP (-2)  // keylen value for incomplete mapping
-
 /// Maximum number of streams to read script from
 enum { NSCRIPT = 15, };
 
@@ -33,4 +24,3 @@ extern FileDescriptor *scriptin[NSCRIPT];
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "getchar.h.generated.h"
 #endif
-#endif  // NVIM_GETCHAR_H