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

1 files changed, 2 insertions, 29 deletions

diff --git a/src/nvim/message.h b/src/nvim/message.h
index adbb40277b..c11c33c039 100644
--- a/src/nvim/message.h
+++ b/src/nvim/message.h
@@ -3,13 +3,11 @@
 #include <errno.h>
 #include <stdbool.h>
 #include <stddef.h>  // IWYU pragma: keep
-#include <stdio.h>
 
-#include "klib/kvec.h"
-#include "nvim/api/private/defs.h"
 #include "nvim/ex_cmds_defs.h"  // IWYU pragma: keep
 #include "nvim/grid_defs.h"
 #include "nvim/macros_defs.h"
+#include "nvim/message_defs.h"  // IWYU pragma: keep
 
 /// Types of dialogs passed to do_dialog().
 enum {
@@ -30,25 +28,7 @@ enum {
   VIM_DISCARDALL = 6,
 };
 
-/// special attribute addition: Put message in history
-enum { MSG_HIST = 0x1000, };
-
-typedef struct {
-  String text;
-  int attr;
-} HlMessageChunk;
-
-typedef kvec_t(HlMessageChunk) HlMessage;
-
-/// Message history for `:messages`
-typedef struct msg_hist {
-  struct msg_hist *next;  ///< Next message.
-  char *msg;              ///< Message text.
-  const char *kind;       ///< Message kind (for msg_ext)
-  int attr;               ///< Message highlighting.
-  bool multiline;         ///< Multiline message.
-  HlMessage multiattr;    ///< multiattr message.
-} MessageHistoryEntry;
+enum { MSG_HIST = 0x1000, };  ///< special attribute addition: Put message in history
 
 /// First message
 extern MessageHistoryEntry *first_msg_hist;
@@ -84,10 +64,3 @@ EXTERN int msg_listdo_overwrite INIT( = 0);
 // Prefer using semsg(), because perror() may send the output to the wrong
 // destination and mess up the screen.
 #define PERROR(msg) (void)semsg("%s: %s", (msg), strerror(errno))
-
-#ifndef MSWIN
-/// Headless (no UI) error message handler.
-# define os_errmsg(str)        fprintf(stderr, "%s", (str))
-/// Headless (no UI) message handler.
-# define os_msg(str)           printf("%s", (str))
-#endif