Merge multiterm into gfxmenu+multiterm

diff --cc Makefile.in
Simple merge

diff --cc commands/minicmd.c
Simple merge

diff --cc commands/videotest.c
Simple merge

diff --cc conf/any-emu.rmk
Simple merge

diff --cc conf/common.rmk
Simple merge

diff --cc configure.ac
Simple merge

diff --cc font/font.c
Simple merge

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

diff --cc kern/misc.c
Simple merge

diff --cc loader/i386/linux.c
Simple merge

diff --cc loader/xnu.c
index 85a19033f41274d99b565c5a94af9b9a81b7716d,f3ae3888a0de29532fec49124d2e7efd972de2e7..7f6c697cfed5d5c9d75fb5c525a5fb27112471bc
--- 1/loader/xnu.c
--- 2/loader/xnu.c
+++ b/loader/xnu.c
@@@ -1433,16 -1412,13 +1433,16 @@@ GRUB_MOD_INIT(xnu
    cmd_kext = grub_register_command ("xnu_kext", grub_cmd_xnu_kext, 0,
                                    "Load XNU extension.");
    cmd_kextdir = grub_register_command ("xnu_kextdir", grub_cmd_xnu_kextdir,
-                                      "xnu_kextdir DIRECTORY [OSBundleRequired]",
-                                      "Load XNU extension directory");
+                                      "DIRECTORY [OSBundleRequired]",
+                                      "Load XNU extension directory.");
    cmd_ramdisk = grub_register_command ("xnu_ramdisk", grub_cmd_xnu_ramdisk, 0,
                                       "Load XNU ramdisk. "
-                                      "It will be seen as md0");
+                                      "It will be seen as md0.");
 -  cmd_splash = grub_register_command ("xnu_splash", grub_cmd_xnu_splash, 0,
 -                                    "Load a splash image for XNU.");
 +  cmd_splash = grub_register_extcmd ("xnu_splash",
 +                                   grub_cmd_xnu_splash,
 +                                   GRUB_COMMAND_FLAG_BOTH, 0,
-                                    "Load a splash image for XNU",
++                                   "Load a splash image for XNU.",
 +                                   xnu_splash_cmd_options);
  
  #ifndef GRUB_UTIL
    cmd_resume = grub_register_command ("xnu_resume", grub_cmd_xnu_resume,

diff --cc normal/cmdline.c
Simple merge

diff --cc term/gfxterm.c
index fc94f951198eef5e926b29f641d4ff8047d1f994,2a7886aa094ec13e62d4119974f5a9be67b02f30..0abe0f07d06d950fd869d6cc20beffcfdc3b87d5
--- 1/term/gfxterm.c
--- 2/term/gfxterm.c
+++ b/term/gfxterm.c
@@@ -1181,14 -958,9 +1181,13 @@@ GRUB_MOD_INIT(term_gfxterm
  #else
    grub_term_register_output ("gfxterm", &grub_video_term);
  #endif
- 
 -  cmd = grub_register_command ("background_image",
 -                             grub_gfxterm_background_image_cmd,
 -                             0, "Load background image for active terminal.");
 +  background_image_cmd_handle =
 +    grub_register_extcmd ("background_image",
 +                          grub_gfxterm_background_image_cmd,
 +                          GRUB_COMMAND_FLAG_BOTH,
-                           "background_image [-m (stretch|normal)] FILE",
++                          "[-m (stretch|normal)] FILE",
 +                          "Load background image for active terminal.",
 +                          background_image_cmd_options);
  }
  
  GRUB_MOD_FINI(term_gfxterm)

diff --cc util/grub-install.in
Simple merge

diff --cc util/grub.d/10_hurd.in
Simple merge

diff --cc util/i386/efi/grub-install.in
Simple merge

diff --cc video/efi_gop.c
Simple merge

diff --cc video/efi_uga.c
Simple merge

diff --cc video/fb/video_fb.c
Simple merge

diff --cc video/i386/pc/vbe.c
Simple merge

diff --cc video/video.c
Simple merge