From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Jul 2010 20:06:43 +0000 (+0200)
Subject: Fix mismerge
X-Git-Tag: 1.99~763^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb73efb7944841f98053a0b76a6108e0ab541080;p=thirdparty%2Fgrub.git

Fix mismerge
---

diff --git a/commands/help.c b/commands/help.c
index 964f8f5ac..7ccfc4fac 100644
--- a/commands/help.c
+++ b/commands/help.c
@@ -49,19 +49,20 @@ grub_cmd_help (grub_extcmd_t ext __attribute__ ((unused)), int argc,
 	  			      
 	    command_help = grub_xasprintf ("%s %s", cmd->name, summary_translated);
 	    if (!command_help)
-	      return 1;
+	      break;
 
 	    grub_utf8_to_ucs4_alloc (command_help, &unicode_command_help,
 				     &unicode_last_position);
+
 	    FOR_ACTIVE_TERM_OUTPUTS(term)
 	    {
 	      unsigned stringwidth;
 	      grub_uint32_t *unicode_last_screen_position;
-	    
+
 	      unicode_last_screen_position = unicode_command_help;
-	    
+
 	      stringwidth = 0;
-	    
+
 	      while (unicode_last_screen_position < unicode_last_position && 
 		     stringwidth < ((grub_term_width (term) / 2) - 2))
 		{