forked from aniani/vim
patch 8.1.0779: argument for message functions is inconsistent
Problem: Argument for message functions is inconsistent. Solution: Make first argument to msg() "char *".
This commit is contained in:
14
src/menu.c
14
src/menu.c
@@ -1151,7 +1151,7 @@ show_menus(char_u *path_name, int modes)
|
||||
|
||||
/* Now we have found the matching menu, and we list the mappings */
|
||||
/* Highlight title */
|
||||
MSG_PUTS_TITLE(_("\n--- Menus ---"));
|
||||
msg_puts_title(_("\n--- Menus ---"));
|
||||
|
||||
show_menus_recursive(parent, modes, 0);
|
||||
return OK;
|
||||
@@ -1175,11 +1175,11 @@ show_menus_recursive(vimmenu_T *menu, int modes, int depth)
|
||||
if (got_int) /* "q" hit for "--more--" */
|
||||
return;
|
||||
for (i = 0; i < depth; i++)
|
||||
MSG_PUTS(" ");
|
||||
msg_puts(" ");
|
||||
if (menu->priority)
|
||||
{
|
||||
msg_outnum((long)menu->priority);
|
||||
MSG_PUTS(" ");
|
||||
msg_puts(" ");
|
||||
}
|
||||
/* Same highlighting as for directories!? */
|
||||
msg_outtrans_attr(menu->name, HL_ATTR(HLF_D));
|
||||
@@ -1194,8 +1194,8 @@ show_menus_recursive(vimmenu_T *menu, int modes, int depth)
|
||||
if (got_int) /* "q" hit for "--more--" */
|
||||
return;
|
||||
for (i = 0; i < depth + 2; i++)
|
||||
MSG_PUTS(" ");
|
||||
msg_puts((char_u*)menu_mode_chars[bit]);
|
||||
msg_puts(" ");
|
||||
msg_puts(menu_mode_chars[bit]);
|
||||
if (menu->noremap[bit] == REMAP_NONE)
|
||||
msg_putchar('*');
|
||||
else if (menu->noremap[bit] == REMAP_SCRIPT)
|
||||
@@ -1210,9 +1210,9 @@ show_menus_recursive(vimmenu_T *menu, int modes, int depth)
|
||||
msg_putchar('-');
|
||||
else
|
||||
msg_putchar(' ');
|
||||
MSG_PUTS(" ");
|
||||
msg_puts(" ");
|
||||
if (*menu->strings[bit] == NUL)
|
||||
msg_puts_attr((char_u *)"<Nop>", HL_ATTR(HLF_8));
|
||||
msg_puts_attr("<Nop>", HL_ATTR(HLF_8));
|
||||
else
|
||||
msg_outtrans_special(menu->strings[bit], FALSE);
|
||||
}
|
||||
|
Reference in New Issue
Block a user