From efa924f66b183d9cf2404ce91c4f009c27e0515a Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 18 Oct 2021 09:08:46 -0400 Subject: vim-patch:8.1.0743: giving error messages is not flexible Problem: Giving error messages is not flexible. Solution: Add semsg(). Change argument from "char_u *" to "char *", also for msg() and get rid of most MSG macros. (Ozaki Kiichi, closes vim/vim#3302) Also make emsg() accept a "char *" argument. Get rid of an enormous number of type casts. https://github.com/vim/vim/commit/f9e3e09fdc93be9f0d47afbc6c7df1188c2a5a0d --- src/nvim/message.h | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'src/nvim/message.h') diff --git a/src/nvim/message.h b/src/nvim/message.h index 6d4d030500..e22c2e1e3f 100644 --- a/src/nvim/message.h +++ b/src/nvim/message.h @@ -38,30 +38,6 @@ /// 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) emsgf((const char *)(s), (p)) - -/// Like #EMSG, but for messages with two "%s" inside -#define EMSG3(s, p, q) emsgf((const char *)(s), (p), (q)) - -/// Like #EMSG, but for messages with one "%" PRId64 inside -#define EMSGN(s, n) emsgf((const char *)(s), (int64_t)(n)) - -/// Like #EMSG, but for messages with one "%" PRIu64 inside -#define EMSGU(s, n) emsgf((const char *)(s), (uint64_t)(n)) - -/// Like #EMSG, but for internal messages -#define IEMSG(s) iemsg((const char *)(s)) - -/// Like #EMSG2, but for internal messages -#define IEMSG2(s, p) iemsgf((const char *)(s), (p)) - -/// Like #EMSGN, but for internal messages -#define IEMSGN(s, n) iemsgf((const char *)(s), (int64_t)(n)) - /// Display message at the recorded position #define MSG_PUTS(s) msg_puts((const char *)(s)) -- cgit From e6ff154be6da8bd53b604fb6e38686acae75b24f Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 23 Oct 2021 16:04:37 -0400 Subject: vim-patch:8.1.0779: argument for message functions is inconsistent Problem: Argument for message functions is inconsistent. Solution: Make first argument to msg() "char *". https://github.com/vim/vim/commit/32526b3c1846025f0e655f41efd4e5428da16b6c --- src/nvim/message.h | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'src/nvim/message.h') diff --git a/src/nvim/message.h b/src/nvim/message.h index e22c2e1e3f..316b2df7a4 100644 --- a/src/nvim/message.h +++ b/src/nvim/message.h @@ -30,29 +30,6 @@ #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((const char *)(s), (attr)) - -/// Display error message -/// -/// Display message at the recorded position -#define MSG_PUTS(s) msg_puts((const char *)(s)) - -/// Display message at the recorded position, highlighted -#define MSG_PUTS_ATTR(s, a) msg_puts_attr((const char *)(s), (a)) - -/// Like #MSG_PUTS, but highlight like title -#define MSG_PUTS_TITLE(s) msg_puts_title((const char *)(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)) - typedef struct { String text; int attr; -- cgit