Fix mismerge
This commit is contained in:
parent
41ca7b81a9
commit
fb73efb794
1 changed files with 5 additions and 4 deletions
|
@ -49,10 +49,11 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
|
||||||
|
|
||||||
command_help = grub_xasprintf ("%s %s", cmd->name, summary_translated);
|
command_help = grub_xasprintf ("%s %s", cmd->name, summary_translated);
|
||||||
if (!command_help)
|
if (!command_help)
|
||||||
return 1;
|
break;
|
||||||
|
|
||||||
grub_utf8_to_ucs4_alloc (command_help, &unicode_command_help,
|
grub_utf8_to_ucs4_alloc (command_help, &unicode_command_help,
|
||||||
&unicode_last_position);
|
&unicode_last_position);
|
||||||
|
|
||||||
FOR_ACTIVE_TERM_OUTPUTS(term)
|
FOR_ACTIVE_TERM_OUTPUTS(term)
|
||||||
{
|
{
|
||||||
unsigned stringwidth;
|
unsigned stringwidth;
|
||||||
|
|
Loading…
Reference in a new issue