thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0779: argument for message functions is inconsistent

Browse Source 
Problem:    Argument for message functions is inconsistent.
Solution:   Make first argument to msg() "char *".
This commit is contained in:
Bram Moolenaar
2019-01-19 17:43:09 +01:00
parent d383c92ec1
commit 32526b3c18
56 changed files with 679 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/ops.c
View File

@@ -302,7 +302,7 @@ op_shift(oparg_T *oap, int curs_top, int amount)
vim_snprintf((char *)IObuff, IOSIZE,
NGETTEXT(msg_line_single, msg_line_plural, oap->line_count),
oap->line_count, op, amount);
msg(IObuff);
msg((char *)IObuff);
}
/*
@@ -1112,7 +1112,7 @@ do_record(int c)
* adds the escaping back later.
*/
reg_recording = 0;
MSG("");
msg("");
p = get_recorded();
if (p == NULL)
retval = FAIL;
@@ -3049,7 +3049,7 @@ free_yank(long n)
VIM_CLEAR(y_current->y_array);
#ifdef AMIGA
if (n >= 1000)
MSG("");
msg("");
#endif
}
}
@@ -4285,7 +4285,7 @@ ex_display(exarg_T *eap)
attr = HL_ATTR(HLF_8);
/* Highlight title */
MSG_PUTS_TITLE(_("\n--- Registers ---"));
msg_puts_title(_("\n--- Registers ---"));
for (i = -1; i < NUM_REGISTERS && !got_int; ++i)
{
name = get_register_name(i);
@@ -4327,14 +4327,14 @@ ex_display(exarg_T *eap)
msg_putchar('\n');
msg_putchar('"');
msg_putchar(name);
MSG_PUTS(" ");
msg_puts(" ");
n = (int)Columns - 6;
for (j = 0; j < yb->y_size && n > 1; ++j)
{
if (j)
{
MSG_PUTS_ATTR("^J", attr);
msg_puts_attr("^J", attr);
n -= 2;
}
for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p)
@@ -4349,7 +4349,7 @@ ex_display(exarg_T *eap)
}
}
if (n > 1 && yb->y_type == MLINE)
MSG_PUTS_ATTR("^J", attr);
msg_puts_attr("^J", attr);
out_flush(); /* show one line at a time */
}
ui_breakcheck();
@@ -4361,7 +4361,7 @@ ex_display(exarg_T *eap)
if ((p = get_last_insert()) != NULL
&& (arg == NULL || vim_strchr(arg, '.') != NULL) && !got_int)
{
MSG_PUTS("\n\". ");
msg_puts("\n\". ");
dis_msg(p, TRUE);
}
@@ -4371,7 +4371,7 @@ ex_display(exarg_T *eap)
if (last_cmdline != NULL && (arg == NULL || vim_strchr(arg, ':') != NULL)
&& !got_int)
{
MSG_PUTS("\n\": ");
msg_puts("\n\": ");
dis_msg(last_cmdline, FALSE);
}
@@ -4381,7 +4381,7 @@ ex_display(exarg_T *eap)
if (curbuf->b_fname != NULL
&& (arg == NULL || vim_strchr(arg, '%') != NULL) && !got_int)
{
MSG_PUTS("\n\"% ");
msg_puts("\n\"% ");
dis_msg(curbuf->b_fname, FALSE);
}
@@ -4395,7 +4395,7 @@ ex_display(exarg_T *eap)
if (buflist_name_nr(0, &fname, &dummy) != FAIL)
{
MSG_PUTS("\n\"# ");
msg_puts("\n\"# ");
dis_msg(fname, FALSE);
}
}
@@ -4406,7 +4406,7 @@ ex_display(exarg_T *eap)
if (last_search_pat() != NULL
&& (arg == NULL || vim_strchr(arg, '/') != NULL) && !got_int)
{
MSG_PUTS("\n\"/ ");
msg_puts("\n\"/ ");
dis_msg(last_search_pat(), FALSE);
}
@@ -4417,7 +4417,7 @@ ex_display(exarg_T *eap)
if (expr_line != NULL && (arg == NULL || vim_strchr(arg, '=') != NULL)
&& !got_int)
{
MSG_PUTS("\n\"= ");
msg_puts("\n\"= ");
dis_msg(expr_line, FALSE);
}
#endif
@@ -7401,7 +7401,7 @@ cursor_pos_info(dict_T *dict)
{
if (dict == NULL)
{
MSG(_(no_lines_msg));
msg(_(no_lines_msg));
return;
}
}
@@ -7615,7 +7615,7 @@ cursor_pos_info(dict_T *dict)
/* Don't shorten this message, the user asked for it. */
p = p_shm;
p_shm = (char_u *)"";
msg(IObuff);
msg((char *)IObuff);
p_shm = p;
}
}