Mercurial > vim
diff src/misc1.c @ 15543:dd725a8ab112 v8.1.0779
patch 8.1.0779: argument for message functions is inconsistent
commit https://github.com/vim/vim/commit/32526b3c1846025f0e655f41efd4e5428da16b6c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 19 17:43:09 2019 +0100
patch 8.1.0779: argument for message functions is inconsistent
Problem: Argument for message functions is inconsistent.
Solution: Make first argument to msg() "char *".
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 19 Jan 2019 17:45:07 +0100 |
| parents | 3ef31ce9d9f9 |
| children | d89c5b339c2a |
line wrap: on
line diff
--- 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)); } } }