81987f4958
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
29 lines
1.0 KiB
Diff
29 lines
1.0 KiB
Diff
From e29b4dd346fa10dc6a073239ef1ed8fb32a0c838 Mon Sep 17 00:00:00 2001
|
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
|
Date: Fri, 7 Jun 2013 14:08:49 -0400
|
|
Subject: [PATCH 095/206] Use the correct indentation for the term help text
|
|
|
|
That is consistent with the menu help text
|
|
---
|
|
grub-core/normal/main.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index f57b7508a76..0ce59fdc3f0 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -426,8 +426,8 @@ grub_normal_reader_init (int nested)
|
|
grub_normal_init_page (term, 1);
|
|
grub_term_setcursor (term, 1);
|
|
|
|
- if (grub_term_width (term) > 3 + STANDARD_MARGIN + 20)
|
|
- grub_print_message_indented (msg_formatted, 3, STANDARD_MARGIN, term);
|
|
+ if (grub_term_width (term) > 2 * STANDARD_MARGIN + 20)
|
|
+ grub_print_message_indented (msg_formatted, STANDARD_MARGIN, STANDARD_MARGIN, term);
|
|
else
|
|
grub_print_message_indented (msg_formatted, 0, 0, term);
|
|
grub_putcode ('\n', term);
|
|
--
|
|
2.15.0
|
|
|