c78952
From 93018f5d1727eb58dead129f150a36080c22530a Mon Sep 17 00:00:00 2001
f4c76c
From: William Jon McCann <william.jon.mccann@gmail.com>
f4c76c
Date: Fri, 7 Jun 2013 10:52:32 -0400
31cddd
Subject: [PATCH] Use the standard margin for the timeout string
f4c76c
f4c76c
So that it aligns with the other messages
f4c76c
---
f4c76c
 grub-core/normal/menu_text.c | 6 +++---
f4c76c
 1 file changed, 3 insertions(+), 3 deletions(-)
f4c76c
f4c76c
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
ec4acb
index 1ed2bd92cf8..7681f7d2893 100644
f4c76c
--- a/grub-core/normal/menu_text.c
f4c76c
+++ b/grub-core/normal/menu_text.c
f4c76c
@@ -372,7 +372,7 @@ grub_menu_init_page (int nested, int edit,
f4c76c
   if (bottom_message)
f4c76c
     {
f4c76c
       grub_term_gotoxy (term,
f4c76c
-			(struct grub_term_coordinate) { GRUB_TERM_MARGIN,
f4c76c
+			(struct grub_term_coordinate) { STANDARD_MARGIN,
f4c76c
 			    geo->timeout_y });
f4c76c
 
f4c76c
       print_message (nested, edit, term, 0);
f4c76c
@@ -407,14 +407,14 @@ menu_text_print_timeout (int timeout, void *dataptr)
f4c76c
   if (data->timeout_msg == TIMEOUT_UNKNOWN)
f4c76c
     {
f4c76c
       data->timeout_msg = grub_print_message_indented_real (msg_translated,
f4c76c
-							    3, 1, data->term, 1)
f4c76c
+							    STANDARD_MARGIN, 1, data->term, 1)
f4c76c
 	<= data->geo.timeout_lines ? TIMEOUT_NORMAL : TIMEOUT_TERSE;
f4c76c
       if (data->timeout_msg == TIMEOUT_TERSE)
f4c76c
 	{
f4c76c
 	  grub_free (msg_translated);
f4c76c
 	  msg_translated = grub_xasprintf (_("%ds"), timeout);
f4c76c
 	  if (grub_term_width (data->term) < 10)
f4c76c
-	    data->timeout_msg = TIMEOUT_TERSE_NO_MARGIN;
f4c76c
+	    data->timeout_msg = STANDARD_MARGIN;
f4c76c
 	}
f4c76c
     }
f4c76c