vim: Move *MSG* macros to message.h

Note: OUT* macros were removed because they are no longer used anywhere.

2 files changed, 41 insertions, 15 deletions

diff --git a/src/nvim/message.h b/src/nvim/message.h
index 019c7bfb73..9249596bec 100644
--- a/src/nvim/message.h
+++ b/src/nvim/message.h
@@ -4,6 +4,7 @@
 #include <stdbool.h>
 #include <stdarg.h>
 #include "nvim/eval_defs.h"  // for typval_T
+#include "nvim/ex_cmds_defs.h"  // for exarg_T
 
 /*
  * Types of dialogs passed to do_dialog().
@@ -24,6 +25,45 @@
 #define VIM_ALL         5
 #define VIM_DISCARDALL  6
 
+/// Show plain message
+#define MSG(s)                      msg((char_u *)(s))
+
+/// Show message highlighted according to the attr
+#define MSG_ATTR(s, attr)           msg_attr((char_u *)(s), (attr))
+
+/// Display error message
+///
+/// Sets error flag in process, can be transformed into an exception.
+#define EMSG(s)                     emsg((char_u *)(s))
+
+/// Like #EMSG, but for messages with one "%s" inside
+#define EMSG2(s, p)                 emsg2((char_u *)(s), (char_u *)(p))
+
+/// Like #EMSG, but for messages with two "%s" inside
+#define EMSG3(s, p, q)              emsg3((char_u *)(s), (char_u *)(p), \
+    (char_u *)(q))
+
+/// Like #EMSG, but for messages with one "%" PRId64 inside
+#define EMSGN(s, n)                 emsgn((char_u *)(s), (int64_t)(n))
+
+/// Like #EMSG, but for messages with one "%" PRIu64 inside
+#define EMSGU(s, n)                 emsgu((char_u *)(s), (uint64_t)(n))
+
+/// Display message at the recorded position
+#define MSG_PUTS(s)                 msg_puts((char_u *)(s))
+
+/// Display message at the recorded position, highlighted
+#define MSG_PUTS_ATTR(s, a)         msg_puts_attr((char_u *)(s), (a))
+
+/// Like #MSG_PUTS, but highlight like title
+#define MSG_PUTS_TITLE(s)           msg_puts_title((char_u *)(s))
+
+/// Like #MSG_PUTS, but if middle part of too long messages it will be replaced
+#define MSG_PUTS_LONG(s)            msg_puts_long_attr((char_u *)(s), 0)
+
+/// Like #MSG_PUTS_ATTR, but if middle part of long messages will be replaced
+#define MSG_PUTS_LONG_ATTR(s, a)    msg_puts_long_attr((char_u *)(s), (a))
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "message.h.generated.h"
 #endif
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index 545b903d2f..a94b2e12f2 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -271,21 +271,7 @@ enum {
 
 # define vim_strpbrk(s, cs) (char_u *)strpbrk((char *)(s), (char *)(cs))
 
-#define MSG(s)                      msg((char_u *)(s))
-#define MSG_ATTR(s, attr)           msg_attr((char_u *)(s), (attr))
-#define EMSG(s)                     emsg((char_u *)(s))
-#define EMSG2(s, p)                 emsg2((char_u *)(s), (char_u *)(p))
-#define EMSG3(s, p, q)              emsg3((char_u *)(s), (char_u *)(p), \
-    (char_u *)(q))
-#define EMSGN(s, n)                 emsgn((char_u *)(s), (int64_t)(n))
-#define EMSGU(s, n)                 emsgu((char_u *)(s), (uint64_t)(n))
-#define OUT_STR(s)                  out_str((char_u *)(s))
-#define OUT_STR_NF(s)               out_str_nf((char_u *)(s))
-#define MSG_PUTS(s)                 msg_puts((char_u *)(s))
-#define MSG_PUTS_ATTR(s, a)         msg_puts_attr((char_u *)(s), (a))
-#define MSG_PUTS_TITLE(s)           msg_puts_title((char_u *)(s))
-#define MSG_PUTS_LONG(s)            msg_puts_long_attr((char_u *)(s), 0)
-#define MSG_PUTS_LONG_ATTR(s, a)    msg_puts_long_attr((char_u *)(s), (a))
+#include "nvim/message.h"
 
 /* Prefer using emsg3(), because perror() may send the output to the wrong
  * destination and mess up the screen. */