Resync with trunk

diff --cc Makefile.in
Simple merge

diff --cc conf/common.rmk
index ee503f8b6ccf235f96c799d4cd7c7e9012a0f052,ffcdf045c78509894c2b580509e5c8a00e4e3441..a83bd0fcaf8e15b54f42e56f9daa167649555032
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -88,9 -88,14 +88,17 @@@ endi
  bin_UTILITIES += grub-mkrelpath
  grub_mkrelpath_SOURCES = gnulib/progname.c util/grub-mkrelpath.c util/misc.c
  
 +bin_UTILITIES += grub-bin2h
 +grub_bin2h_SOURCES = gnulib/progname.c util/bin2h.c
 +
+ # For grub-script-check.
+ bin_UTILITIES += grub-script-check
+ util/grub-script-check.c_DEPENDENCIES = grub_script_check_init.h
+ grub_script_check_SOURCES = gnulib/progname.c util/grub-script-check.c util/misc.c \
+       script/main.c script/script.c script/function.c script/lexer.c \
+       kern/handler.c kern/err.c kern/parser.c kern/list.c \
+       kern/misc.c kern/env.c grub_script_check_init.c grub_script.tab.c
+ 
  # For the parser.
  grub_script.tab.c grub_script.tab.h: script/parser.y
        $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/script/parser.y

diff --cc util/grub-mkfont.c
index 3dd0bafdd540a954fae81602eb21182e0e819e8f,fcd35afd455c9de0c8213c6fe382618cbb82be45..38906a70e92484324946bcbba50419392424a0c2
--- 1/util/grub-mkfont.c
--- 2/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@@ -639,25 -597,8 +639,25 @@@ main (int argc, char *argv[]
          }
      }
  
 +  if (file_format == ASCII_BITMAPS && font_info.num_range > 0)
 +    {
 +      grub_util_error ("Option --ascii-bitmaps doesn't accept ranges (use ASCII).");
 +      return 1;
 +    }
 +
 +  else if (file_format == ASCII_BITMAPS)
 +    {
 +      font_info.ranges = xrealloc (font_info.ranges,
 +                                 GRUB_FONT_RANGE_BLOCK *
 +                                 sizeof (grub_uint32_t) * 2);
 +
 +      font_info.ranges[0] = (grub_uint32_t) 0x00;
 +      font_info.ranges[1] = (grub_uint32_t) 0x7f;
 +      font_info.num_range = 1;
 +    }
 +
    if (! output_file)
-     grub_util_error ("No output file is specified.");
+     grub_util_error ("no output file is specified");
  
    if (FT_Init_FreeType (&ft_lib))
      grub_util_error ("FT_Init_FreeType fails");