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>
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 8e5a006c6c48002f3debd99f4c377b443f9f8369 Mon Sep 17 00:00:00 2001
|
|
From: William Jon McCann <william.jon.mccann@gmail.com>
|
|
Date: Fri, 7 Jun 2013 14:59:36 -0400
|
|
Subject: [PATCH 097/206] Fix margins
|
|
|
|
---
|
|
grub-core/normal/menu_text.c | 8 +++-----
|
|
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
|
|
index ecc60f99fc3..0e43f2c10cc 100644
|
|
--- a/grub-core/normal/menu_text.c
|
|
+++ b/grub-core/normal/menu_text.c
|
|
@@ -333,17 +333,15 @@ grub_menu_init_page (int nested, int edit,
|
|
int version_msg = 1;
|
|
|
|
geo->border = 0;
|
|
- geo->first_entry_x = 0 /* margin */ + 0 /* border */;
|
|
- geo->entry_width = grub_term_width (term) - 5;
|
|
+ geo->first_entry_x = 0; /* no margin */
|
|
+ geo->entry_width = grub_term_width (term) - 1;
|
|
|
|
- geo->first_entry_y = 2 /* two empty lines*/
|
|
- + 0 /* GNU GRUB version text */ + 1 /* top border */;
|
|
+ geo->first_entry_y = 3; /* three empty lines*/
|
|
|
|
geo->timeout_lines = 2;
|
|
|
|
/* 3 lines for timeout message and bottom margin. 2 lines for the border. */
|
|
geo->num_entries = grub_term_height (term) - geo->first_entry_y
|
|
- - 1 /* bottom border */
|
|
- 1 /* empty line before info message*/
|
|
- geo->timeout_lines /* timeout */
|
|
- 1 /* empty final line */;
|
|
--
|
|
2.15.0
|
|
|