Changed timeout behaviour

Author: makuhlmann

configure.ac

@@ -31,7 +31,7 @@ dnl (such as BUILD_CC, BUILD_CFLAGS, etc.) for the build type and variables
 dnl with the prefix "TARGET_" (such as TARGET_CC, TARGET_CFLAGS, etc.) are
 dnl used for the target type. See INSTALL for full list of variables.
 
-AC_INIT([GRUB],[2.04],[[email protected]])
+AC_INIT([GRUB],[2.04~nokeymod1],[[email protected]])
 
 AC_CONFIG_AUX_DIR([build-aux])
 

grub-core/normal/menu.c

@@ -693,21 +693,14 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
 	  grub_env_unset ("timeout");
           *auto_boot = 1;
 	  menu_fini ();
-	  return default_entry;
+	  return current_entry;
 	}
 
       c = grub_getkey_noblock ();
 
       /* Negative values are returned on error. */
       if ((c != GRUB_TERM_NO_KEY) && (c > 0))
 	{
-	  if (timeout >= 0)
-	    {
-	      grub_env_unset ("timeout");
-	      grub_env_unset ("fallback");
-	      clear_timeout ();
-	    }
-
 	  switch (c)
 	    {
 	    case GRUB_TERM_KEY_HOME: