merge mainline into intwrap

grub-core/normal/color.c

@@ -125,10 +125,11 @@ set_colors (void)
 
 /* Replace default `normal' colors with the ones specified by user (if any).  */
 char *
-grub_env_write_color_normal (struct grub_env_var *var, const char *val)
+grub_env_write_color_normal (struct grub_env_var *var __attribute__ ((unused)),
+			     const char *val)
 {
   if (grub_parse_color_name_pair (&color_normal, val))
-    return 0;
+    return NULL;
 
   set_colors ();
 
@@ -137,10 +138,11 @@ grub_env_write_color_normal (struct grub_env_var *var, const char *val)
 
 /* Replace default `highlight' colors with the ones specified by user (if any).  */
 char *
-grub_env_write_color_highlight (struct grub_env_var *var, const char *val)
+grub_env_write_color_highlight (struct grub_env_var *var __attribute__ ((unused)),
+				const char *val)
 {
   if (grub_parse_color_name_pair (&color_highlight, val))
-    return 0;
+    return NULL;
 
   set_colors ();
 

grub-core/normal/menu.c

@@ -43,9 +43,20 @@ grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu,
 void
 grub_wait_after_message (void)
 {
+  grub_uint64_t endtime;
   grub_xputs ("\n");
   grub_printf_ (N_("Press any key to continue..."));
-  (void) grub_getkey ();
+  grub_refresh ();
+
+  endtime = grub_get_time_ms () + 10000;
+
+  while (grub_get_time_ms () < endtime)
+    if (grub_checkkey () >= 0)
+      {
+	grub_getkey ();
+	break;
+      }
+
   grub_xputs ("\n");
 }
 

grub-core/normal/term.c

@@ -86,7 +86,7 @@ print_more (void)
   {
     grub_print_ucs4 (unicode_str, unicode_last_position, 0, 0, term);
   }
-  grub_setcolorstate (GRUB_TERM_COLOR_STANDARD);
+  grub_setcolorstate (GRUB_TERM_COLOR_NORMAL);
 
   grub_free (unicode_str);