diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-01-19 17:43:09 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-01-19 17:43:09 +0100 |
commit | 32526b3c1846025f0e655f41efd4e5428da16b6c (patch) | |
tree | e9f3ea5e0daaada049e905b5f1b38b4a45511f3d /src/option.c | |
parent | d383c92ec1d14ffd5c3802f0ffd763e91d547fa8 (diff) |
patch 8.1.0779: argument for message functions is inconsistentv8.1.0779
Problem: Argument for message functions is inconsistent.
Solution: Make first argument to msg() "char *".
Diffstat (limited to 'src/option.c')
-rw-r--r-- | src/option.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/option.c b/src/option.c index ec058e97d8..3be4447dd3 100644 --- a/src/option.c +++ b/src/option.c @@ -8885,7 +8885,7 @@ set_bool_option( static char *w_arabic = N_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'"); msg_source(HL_ATTR(HLF_W)); - MSG_ATTR(_(w_arabic), HL_ATTR(HLF_W)); + msg_attr(_(w_arabic), HL_ATTR(HLF_W)); #ifdef FEAT_EVAL set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_arabic), -1); #endif @@ -10152,13 +10152,13 @@ showoptions( /* Highlight title */ if (all == 2) - MSG_PUTS_TITLE(_("\n--- Terminal codes ---")); + msg_puts_title(_("\n--- Terminal codes ---")); else if (opt_flags & OPT_GLOBAL) - MSG_PUTS_TITLE(_("\n--- Global option values ---")); + msg_puts_title(_("\n--- Global option values ---")); else if (opt_flags & OPT_LOCAL) - MSG_PUTS_TITLE(_("\n--- Local option values ---")); + msg_puts_title(_("\n--- Local option values ---")); else - MSG_PUTS_TITLE(_("\n--- Options ---")); + msg_puts_title(_("\n--- Options ---")); /* * do the loop two times: @@ -10276,12 +10276,12 @@ showoneopt( /* for 'modified' we also need to check if 'ff' or 'fenc' changed. */ if ((p->flags & P_BOOL) && ((int *)varp == &curbuf->b_changed ? !curbufIsChanged() : !*(int *)varp)) - MSG_PUTS("no"); + msg_puts("no"); else if ((p->flags & P_BOOL) && *(int *)varp < 0) - MSG_PUTS("--"); + msg_puts("--"); else - MSG_PUTS(" "); - MSG_PUTS(p->fullname); + msg_puts(" "); + msg_puts(p->fullname); if (!(p->flags & P_BOOL)) { msg_putchar('='); |