From: BVK Chaitanya <bvk@dbook>
Date: Sat, 4 Sep 2010 05:58:45 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~596^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=312e3e3668c7dd532d1c768dcdaa1bdf74011ea3;p=thirdparty%2Fgrub.git

merge with mainline
---

312e3e3668c7dd532d1c768dcdaa1bdf74011ea3
diff --cc grub-core/script/yylex.l
index 1a7084e53,45728dfb4..d4cad8097
--- a/grub-core/script/yylex.l
+++ b/grub-core/script/yylex.l
@@@ -169,7 -176,13 +176,12 @@@ MULTILINE       {WORD}?((\"{DQCHR}*)|(\
  "until"         { RECORD; return GRUB_PARSER_TOKEN_UNTIL;     }
  "while"         { RECORD; return GRUB_PARSER_TOKEN_WHILE;     }
  "function"      { RECORD; return GRUB_PARSER_TOKEN_FUNCTION;  }
 -"menuentry"     { RECORD; return GRUB_PARSER_TOKEN_MENUENTRY; }
  
+ {MULTILINE}     {
+                   if (grub_lexer_unput (yytext, yyscanner))
+ 		    return GRUB_PARSER_TOKEN_BAD;
+ 		}
+ 
  {NAME}          { RECORD; return GRUB_PARSER_TOKEN_NAME; }
  {WORD}          {
                    RECORD;