merge with mainline

diff --cc conf/common.rmk
index cb98854,f92e5bc..908bd74
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -92,9 -94,10 +94,10 @@@ grub_script_check_SOURCES = gnulib/prog
        util/grub-script-check.c util/misc.c kern/emu/misc.c kern/emu/mm.c \
        script/main.c script/script.c script/function.c script/lexer.c \
        kern/err.c kern/list.c \
 -      kern/misc.c kern/env.c grub_script.tab.c \
 +      kern/command.c kern/misc.c kern/env.c grub_script.tab.c \
        grub_script.yy.c
  grub_script_check_CFLAGS = $(GNULIB_UTIL_CFLAGS)
+ grub_script_check_DEPENDENCIES = grub_script.tab.h
  MOSTLYCLEANFILES += symlist.c kernel_syms.lst
  DEFSYMFILES += kernel_syms.lst
  
@@@ -621,9 -634,9 +634,9 @@@ endi
  normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
        normal/auth.c normal/autofs.c  \
        normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
-       normal/menu_entry.c normal/menu_text.c \
+       normal/menu_entry.c normal/menu_text.c normal/charset.c \
        normal/misc.c normal/crypto.c normal/term.c normal/context.c \
-       script/main.c script/script.c script/execute.c script/argv.c \
 -      script/main.c script/script.c script/execute.c unidata.c \
++      script/main.c script/script.c script/execute.c script/argv.c unidata.c \
        script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
  normal_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
  normal_mod_LDFLAGS = $(COMMON_LDFLAGS)

diff --cc include/grub/misc.h
Simple merge

diff --cc normal/main.c
index 75975d0,710b68d..5df8894
--- 1/normal/main.c
--- 2/normal/main.c
+++ b/normal/main.c
@@@ -655,8 -675,10 +675,11 @@@ static void (*grub_xputs_saved) (const 
  GRUB_MOD_INIT(normal)
  {
    grub_context_init ();
 +  grub_script_init ();
  
+   grub_xputs_saved = grub_xputs;
+   grub_xputs = grub_xputs_normal;
+ 
    /* Normal mode shouldn't be unloaded.  */
    if (mod)
      grub_dl_ref (mod);
@@@ -684,8 -709,9 +710,10 @@@
  GRUB_MOD_FINI(normal)
  {
    grub_context_fini ();
 +  grub_script_fini ();
  
+   grub_xputs = grub_xputs_saved;
+ 
    grub_set_history (0);
    grub_register_variable_hook ("pager", 0, 0);
    grub_fs_autoload_hook = 0;

diff --cc script/parser.y
Simple merge

diff --cc util/grub-script-check.c
Simple merge