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/misc1.c | |
| parent | d383c92ec1d14ffd5c3802f0ffd763e91d547fa8 (diff) | |
| download | vim-git-32526b3c1846025f0e655f41efd4e5428da16b6c.tar.gz | |
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/misc1.c')
| -rw-r--r-- | src/misc1.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/misc1.c b/src/misc1.c index a4b56286a..4c9bd2fed 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -3468,7 +3468,7 @@ change_warning( if (msg_row == Rows - 1) msg_col = col; msg_source(HL_ATTR(HLF_W)); - MSG_PUTS_ATTR(_(w_readonly), HL_ATTR(HLF_W) | MSG_HIST); + msg_puts_attr(_(w_readonly), HL_ATTR(HLF_W) | MSG_HIST); #ifdef FEAT_EVAL set_vim_var_string(VV_WARNINGMSG, (char_u *)_(w_readonly), -1); #endif @@ -3742,7 +3742,7 @@ get_number( { if (typed > 0) { - MSG_PUTS("\b \b"); + msg_puts("\b \b"); --typed; } n /= 10; @@ -3786,9 +3786,9 @@ prompt_for_number(int *mouse_used) /* When using ":silent" assume that <CR> was entered. */ if (mouse_used != NULL) - MSG_PUTS(_("Type number and <Enter> or click with mouse (empty cancels): ")); + msg_puts(_("Type number and <Enter> or click with mouse (empty cancels): ")); else - MSG_PUTS(_("Type number and <Enter> (empty cancels): ")); + msg_puts(_("Type number and <Enter> (empty cancels): ")); // Set the state such that text can be selected/copied/pasted and we still // get mouse events. redraw_after_callback() will not redraw if cmdline_row @@ -3846,16 +3846,17 @@ msgmore(long n) if (pn > p_report) { if (n > 0) - vim_snprintf((char *)msg_buf, MSG_BUF_LEN, + vim_snprintf(msg_buf, MSG_BUF_LEN, NGETTEXT("%ld more line", "%ld more lines", pn), pn); else - vim_snprintf((char *)msg_buf, MSG_BUF_LEN, + vim_snprintf(msg_buf, MSG_BUF_LEN, NGETTEXT("%ld line less", "%ld fewer lines", pn), pn); if (got_int) - vim_strcat(msg_buf, (char_u *)_(" (Interrupted)"), MSG_BUF_LEN); + vim_strcat((char_u *)msg_buf, (char_u *)_(" (Interrupted)"), + MSG_BUF_LEN); if (msg(msg_buf)) { - set_keep_msg(msg_buf, 0); + set_keep_msg((char_u *)msg_buf, 0); keep_msg_more = TRUE; } } @@ -3936,7 +3937,7 @@ vim_beep( if (vim_strchr(p_debug, 'e') != NULL) { msg_source(HL_ATTR(HLF_W)); - msg_attr((char_u *)_("Beep!"), HL_ATTR(HLF_W)); + msg_attr(_("Beep!"), HL_ATTR(HLF_W)); } } } |