merge with mainline

diff --cc script/execute.c
index 4a3f249b085dfe1d9cfa93c7c39c2bf6d5133d6f,c45a15d29b08a36342ab885fcb7f377c259230a8..a1e932df203b04c517a6672292f5ed32227a5477
--- 1/script/execute.c
--- 2/script/execute.c
+++ b/script/execute.c
@@@ -269,13 -203,14 +269,13 @@@ grub_script_execute_cmdline (struct gru
    grub_script_function_t func = 0;
    char errnobuf[18];
    char *cmdname;
 +  struct grub_script_argv argv = { 0, 0 };
  
    /* Lookup the command.  */
-   if (grub_script_arglist_to_argv (cmdline->arglist, &argv))
 -  args = grub_script_execute_arglist_to_argv (cmdline->arglist, &argcount);
 -  if (! args || ! args[0])
++  if (grub_script_arglist_to_argv (cmdline->arglist, &argv) || ! argv.args[0])
      return grub_errno;
  
 -  cmdname = args[0];
 +  cmdname = argv.args[0];
    grubcmd = grub_command_find (cmdname);
    if (! grubcmd)
      {

diff --cc script/yylex.l
index bfc53a6ff67ec0be9060aafcb2f1d7414114f281,e9659832bdca9b5fe1c17d6bf555a36f337e1d69..45760c158ee1dda96a6cd842400007449362ff0f
--- 1/script/yylex.l
--- 2/script/yylex.l
+++ b/script/yylex.l
@@@ -116,11 -116,10 +116,11 @@@ COMMENT         #.*
  
  CHAR            [^{}|&$;<> \t\n\'\"\\]
  DIGITS          [[:digit:]]+
- NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
+ NAME            [[:alpha:]_][[:alnum:]_]*
  
  ESC             \\.
 -VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}
 +SPECIAL         \?|\#|\*|\@
 +VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|${SPECIAL}|$\{{SPECIAL}\}
  DQSTR           \"([^\\\"]|{ESC})*\"
  SQSTR           \'[^\']*\'
  WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+