Remove char_u: message:smsg_attr()

This commit is contained in:
Michael Reed
2015-05-13 15:29:50 -04:00
parent 3c5864772f
commit 62bcd98ae3
4 changed files with 8 additions and 7 deletions

View File

@@ -3899,7 +3899,7 @@ void do_sub(exarg_T *eap)
/* write message same highlighting as for /* write message same highlighting as for
* wait_return */ * wait_return */
smsg_attr(hl_attr(HLF_R), smsg_attr(hl_attr(HLF_R),
(char_u *)_("replace with %s (y/n/a/q/l/^E/^Y)?"), sub); _("replace with %s (y/n/a/q/l/^E/^Y)?"), sub);
msg_no_more = FALSE; msg_no_more = FALSE;
msg_scroll = i; msg_scroll = i;
showruler(TRUE); showruler(TRUE);

View File

@@ -531,7 +531,7 @@ staterr:
if (p_csverbose) { if (p_csverbose) {
msg_clr_eos(); msg_clr_eos();
(void)smsg_attr(hl_attr(HLF_R), (void)smsg_attr(hl_attr(HLF_R),
(char_u *)_("Added cscope database %s"), _("Added cscope database %s"),
csinfo[i].fname); csinfo[i].fname);
} }
} }
@@ -1316,7 +1316,7 @@ cs_kill_execute (
if (p_csverbose) { if (p_csverbose) {
msg_clr_eos(); msg_clr_eos();
(void)smsg_attr(hl_attr(HLF_R) | MSG_HIST, (void)smsg_attr(hl_attr(HLF_R) | MSG_HIST,
(char_u *)_("cscope connection %s closed"), cname); _("cscope connection %s closed"), cname);
} }
cs_release_csp(i, TRUE); cs_release_csp(i, TRUE);
} }

View File

@@ -339,12 +339,12 @@ int smsg(char *s, ...)
return msg(IObuff); return msg(IObuff);
} }
int smsg_attr(int attr, char_u *s, ...) int smsg_attr(int attr, char *s, ...)
{ {
va_list arglist; va_list arglist;
va_start(arglist, s); va_start(arglist, s);
vim_vsnprintf((char *)IObuff, IOSIZE, (char *)s, arglist, NULL); vim_vsnprintf((char *)IObuff, IOSIZE, s, arglist, NULL);
va_end(arglist); va_end(arglist);
return msg_attr(IObuff, attr); return msg_attr(IObuff, attr);
} }

View File

@@ -2296,7 +2296,8 @@ int ask_yesno(char_u *str, int direct)
while (r != 'y' && r != 'n') { while (r != 'y' && r != 'n') {
/* same highlighting as for wait_return */ /* same highlighting as for wait_return */
smsg_attr(hl_attr(HLF_R), (char_u *)"%s (y/n)?", str); smsg_attr(hl_attr(HLF_R),
"%s (y/n)?", str);
if (direct) if (direct)
r = get_keystroke(); r = get_keystroke();
else else