pull-in nested-record branch

diff --cc include/grub/script_sh.h
index 7618633ad2ea319cd91bc2b3215d195a6992e8ca,42fc2259a233abe6b49d7ed53b1f187efb37a0a6..ffedf5c75cce2855a0bcd0eb0149d4f79a5fc642
--- 1/include/grub/script_sh.h
--- 2/include/grub/script_sh.h
+++ b/include/grub/script_sh.h
@@@ -360,8 -344,8 +360,9 @@@ grub_script_function_t grub_script_func
                                                    struct grub_script *cmd);
  void grub_script_function_remove (const char *name);
  grub_script_function_t grub_script_function_find (char *functionname);
 -int grub_script_function_call (grub_script_function_t func,
 -                             int argc, char **args);
++
 +grub_err_t grub_script_function_call (grub_script_function_t func,
 +                                    int argc, char **args);
  
  char **
  grub_script_execute_arglist_to_argv (struct grub_script_arglist *arglist, int *count);