merge with mainline

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

diff --cc script/yylex.l
index c580b1ed32edb73e249ac591ddaf9c6a73f7d5e0,45760c158ee1dda96a6cd842400007449362ff0f..45728dfb4c2c969ebe4f586bf04a496d8b2d9b1b
--- 1/script/yylex.l
--- 2/script/yylex.l
+++ b/script/yylex.l
@@@ -119,18 -116,15 +119,19 @@@ COMMENT         #.*
  
  CHAR            [^{}|&$;<> \t\n\'\"\\]
  DIGITS          [[:digit:]]+
- NAME            [[:alpha:]_][[:alnum:][:digit:]_]*
+ NAME            [[:alpha:]_][[:alnum:]_]*
  
 -ESC             \\.
 +ESC             \\(.|\n)
 +SQCHR           [^\']
 +DQCHR           {ESC}|[^\\\"]
 +DQSTR           \"{DQCHR}*\"
 +SQSTR           \'{SQCHR}*\'
- VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|$\?|$\{\?\}
+ SPECIAL         \?|\#|\*|\@
+ VARIABLE        ${NAME}|$\{{NAME}\}|${DIGITS}|$\{{DIGITS}\}|${SPECIAL}|$\{{SPECIAL}\}
 -DQSTR           \"([^\\\"]|{ESC})*\"
 -SQSTR           \'[^\']*\'
  WORD            ({CHAR}|{DQSTR}|{SQSTR}|{ESC}|{VARIABLE})+
  
 +MULTILINE       {WORD}?((\"{DQCHR}*)|(\'{SQCHR}*)|(\\\n))
 +
  %x              SPLIT
  %x              DQUOTE
  %x              SQUOTE

diff --cc tests/grub_script_echo1.in
Simple merge