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

1 files changed, 9 insertions, 5 deletions

diff --git a/src/nvim/mapping.h b/src/nvim/mapping.h
index 7c48c3bce2..58e28810bc 100644
--- a/src/nvim/mapping.h
+++ b/src/nvim/mapping.h
@@ -1,6 +1,10 @@
 #ifndef NVIM_MAPPING_H
 #define NVIM_MAPPING_H
 
+#include <stdbool.h>
+#include <stddef.h>
+
+#include "lauxlib.h"
 #include "nvim/buffer_defs.h"
 #include "nvim/ex_cmds_defs.h"
 #include "nvim/types.h"
@@ -9,7 +13,7 @@
 /// All possible |:map-arguments| usable in a |:map| command.
 ///
 /// The <special> argument has no effect on mappings and is excluded from this
-/// struct declaration. |noremap| is included, since it behaves like a map
+/// struct declaration. |:noremap| is included, since it behaves like a map
 /// argument when used in a mapping.
 ///
 /// @see mapblock_T
@@ -28,19 +32,19 @@ struct map_arguments {
   /// vim limits this to MAXMAPLEN characters, allowing us to use a static
   /// buffer. Setting lhs_len to a value larger than MAXMAPLEN can signal
   /// that {lhs} was too long and truncated.
-  char_u lhs[MAXMAPLEN + 1];
+  char lhs[MAXMAPLEN + 1];
   size_t lhs_len;
 
   /// Unsimplifed {lhs} of the mapping. If no simplification has been done then alt_lhs_len is 0.
-  char_u alt_lhs[MAXMAPLEN + 1];
+  char alt_lhs[MAXMAPLEN + 1];
   size_t alt_lhs_len;
 
-  char_u *rhs;  /// The {rhs} of the mapping.
+  char *rhs;  /// The {rhs} of the mapping.
   size_t rhs_len;
   LuaRef rhs_lua;  /// lua function as {rhs}
   bool rhs_is_noop;  /// True when the {rhs} should be <Nop>.
 
-  char_u *orig_rhs;  /// The original text of the {rhs}.
+  char *orig_rhs;  /// The original text of the {rhs}.
   size_t orig_rhs_len;
   char *desc;  /// map description
 };