ec4acbbd98
- 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>
28 lines
878 B
Diff
28 lines
878 B
Diff
From 01757871cb2a7355a7f67e80f77a57fecba26f54 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Fri, 21 Jun 2013 14:44:08 -0400
|
|
Subject: [PATCH 098/206] Use -2 instead of -1 for our right-hand margin, so
|
|
linewrapping works (#976643).
|
|
|
|
Signed-off-by: Peter Jones <grub2-owner@fedoraproject.org>
|
|
---
|
|
grub-core/normal/menu_text.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
|
index 0e43f2c10cc..537d4bf86ff 100644
|
|
--- a/grub-core/normal/menu_text.c
|
|
+++ b/grub-core/normal/menu_text.c
|
|
@@ -334,7 +334,7 @@ grub_menu_init_page (int nested, int edit,
|
|
|
|
geo->border = 0;
|
|
geo->first_entry_x = 0; /* no margin */
|
|
- geo->entry_width = grub_term_width (term) - 1;
|
|
+ geo->entry_width = grub_term_width (term) - 2;
|
|
|
|
geo->first_entry_y = 3; /* three empty lines*/
|
|
|
|
--
|
|
2.15.0
|
|
|