merge mainline into newenv

diff --cc conf/any-emu.rmk
index 066bb52ba4390f951d0b6dc06a639cdf6c974cae,5aa923893db17a3807a9ceb39932b47f87b2a644..1277af7911c70a14d2e7928d893485ee8e024cd9
--- 1/conf/any-emu.rmk
--- 2/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@@ -21,13 -23,14 +23,14 @@@ grub_emu_SOURCES = commands/minicmd.c c
        kern/err.c kern/list.c kern/handler.c                           \
        kern/command.c kern/corecmd.c commands/extcmd.c kern/file.c     \
        kern/fs.c commands/boot.c kern/main.c kern/misc.c kern/parser.c \
-       kern/partition.c kern/reader.c kern/term.c                      \
+       kern/partition.c kern/term.c                                    \
        kern/rescue_reader.c kern/rescue_parser.c                       \
        lib/arg.c normal/cmdline.c normal/datetime.c normal/misc.c      \
-       normal/handler.c normal/auth.c normal/autofs.c                  \
+       normal/handler.c normal/auth.c lib/crypto.c normal/autofs.c     \
        normal/completion.c normal/main.c normal/color.c                \
-       normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
-       normal/menu_text.c normal/context.c                             \
+       normal/menu.c normal/menu_entry.c               \
+       normal/menu_text.c normal/crypto.c normal/term.c                \
 -      commands/terminal.c lib/charset.c \
++      commands/terminal.c normal/context.c lib/charset.c \
        script/main.c script/execute.c script/function.c                \
        script/lexer.c script/script.c grub_script.tab.c                \
        partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c   \

diff --cc conf/common.rmk
index 74e2b5bc4481e453aa6d66f81f5899491f2ba999,4e5ed9c73359777a3800f2b8a880a36f9fd182fd..2ea8ebd5a09a3b6768588701852befa68604c586
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -542,8 -587,8 +587,8 @@@ keystatus_mod_LDFLAGS = $(COMMON_LDFLAG
  normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
        normal/auth.c normal/autofs.c normal/handler.c \
        normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
-       normal/menu_entry.c normal/menu_text.c normal/menu_viewer.c \
-       normal/misc.c normal/context.c
+       normal/menu_entry.c normal/menu_text.c \
 -      normal/misc.c normal/crypto.c normal/term.c
++      normal/misc.c normal/crypto.c normal/term.c normal/context.c
  normal_mod_CFLAGS = $(COMMON_CFLAGS)
  normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
  

diff --cc conf/i386-coreboot.rmk
Simple merge

diff --cc conf/i386-efi.rmk
Simple merge

diff --cc conf/i386-ieee1275.rmk
Simple merge

diff --cc conf/i386-pc.rmk
Simple merge

diff --cc conf/powerpc-ieee1275.rmk
Simple merge

diff --cc conf/sparc64-ieee1275.rmk
Simple merge

diff --cc conf/x86_64-efi.rmk
Simple merge

diff --cc include/grub/normal.h
index 0cdc653e69f335b2ae7bfcb8c65006b9938cc414,58b2c7966159d769d63cfd31a8023c392cbbdeae..e804fde7737e2db35ebf9bbea34645633eca93d3
--- 1/include/grub/normal.h
--- 2/include/grub/normal.h
+++ b/include/grub/normal.h
@@@ -95,9 -101,12 +101,15 @@@ void read_command_list (void)
  /* Defined in `autofs.c'.  */
  void read_fs_list (void);
  
 +void grub_context_init (void);
 +void grub_context_fini (void);
 +
+ void read_crypto_list (void);
+ 
+ void read_terminal_list (void);
+ 
+ void grub_set_more (int onoff);
+ 
  #ifdef GRUB_UTIL
  void grub_normal_init (void);
  void grub_normal_fini (void);

diff --cc kern/corecmd.c
index 7e8a3b4f66cedc1332993c6a537c6d77f5089c59,3e508cd2cc5626764c9decb81b9c18707092a651..8b8df63cb8713f0a8deb8e023a4b0f8f6d8b83f4
--- 1/kern/corecmd.c
--- 2/kern/corecmd.c
+++ b/kern/corecmd.c
@@@ -178,11 -190,13 +178,11 @@@ voi
  grub_register_core_commands (void)
  {
    grub_register_command ("set", grub_core_cmd_set,
-                        "set [ENVVAR=VALUE]", "set an environment variable");
+                        "[ENVVAR=VALUE]", "Set an environment variable.");
    grub_register_command ("unset", grub_core_cmd_unset,
-                        "unset ENVVAR", "remove an environment variable");
+                        "ENVVAR", "Remove an environment variable.");
 -  grub_register_command ("export", grub_core_cmd_export,
 -                       "ENVVAR", "Export a variable.");
    grub_register_command ("ls", grub_core_cmd_ls,
-                        "ls [ARG]", "list devices or files");
+                        "[ARG]", "List devices or files.");
    grub_register_command ("insmod", grub_core_cmd_insmod,
-                        "insmod MODULE", "insert a module");
+                        "MODULE", "Insert a module.");
  }

diff --cc kern/env.c
Simple merge

diff --cc kern/main.c
Simple merge

diff --cc normal/main.c
index 53cd9040b3049d0ae2b530604e70460fc31c6b11,6e3518a59405f15bcf35673bf82f21ec58cb64e3..9f8c127730cba1f4a1cad3685e0427a6ad420424
--- 1/normal/main.c
--- 2/normal/main.c
+++ b/normal/main.c
@@@ -613,10 -667,7 +669,9 @@@ GRUB_MOD_INIT(normal
  
  GRUB_MOD_FINI(normal)
  {
 +  grub_context_fini ();
 +
    grub_set_history (0);
-   grub_reader_unregister (&grub_normal_reader);
    grub_register_variable_hook ("pager", 0, 0);
    grub_fs_autoload_hook = 0;
    free_handler_list ();