merge with mainline

diff --cc commands/cat.c
index 3bdafc4c6a2474ff3a84a4ac3060d14f756fd7e2,77a4cc7937040f276dfcf2943ff35d1ddbeabb6f..a70118517af759741b54781c876aefb24d2528f7
--- 1/commands/cat.c
--- 2/commands/cat.c
+++ b/commands/cat.c
@@@ -23,14 -23,20 +23,20 @@@
  #include <grub/term.h>
  #include <grub/misc.h>
  #include <grub/gzio.h>
- #include <grub/command.h>
+ #include <grub/extcmd.h>
  #include <grub/i18n.h>
  
- static grub_err_t
- grub_cmd_cat (grub_command_t cmd __attribute__ ((unused)),
-             int argc, char **args)
+ static const struct grub_arg_option options[] =
+   {
+     {"dos", -1, 0, N_("Accept DOS-style CR/NL line endings."), 0, 0},
+     {0, 0, 0, 0, 0, 0}
+   };
  
 -grub_cmd_cat (grub_extcmd_t cmd, int argc, char **args)
+ static grub_err_t
++grub_cmd_cat (grub_extcmd_context_t ctxt, int argc, char **args)
  {
 -  struct grub_arg_list *state = cmd->state;
++  struct grub_arg_list *state = ctxt->state;
+   int dos = 0;
    grub_file_t file;
    char buf[GRUB_DISK_SECTOR_SIZE];
    grub_ssize_t size;

diff --cc commands/help.c
Simple merge

diff --cc commands/ls.c
Simple merge

diff --cc conf/common.rmk
index c437156b7ef194ff22cc9be9d5f0040ae941417d,f92e5bc4c7051a3393be4ddf1e78a8540f77763d..4ab829470dbf4858403ad0d43ddd295c773d04f1
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -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 script/parser.y
Simple merge

diff --cc term/gfxterm.c
Simple merge

diff --cc term/serial.c
Simple merge

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