=== modified file 'script/lexer.c'
--- script/lexer.c	2009-11-23 15:37:33 +0000
+++ script/lexer.c	2009-11-29 00:16:30 +0000
@@ -350,9 +350,11 @@
 	      if (! (check_varstate (newstate)))
 		{
 		  if (state->state == GRUB_PARSER_STATE_VARNAME2
-		  || state->state == GRUB_PARSER_STATE_QVARNAME2)
-		    nextchar (state);
-		  state->state = newstate;
+		      || state->state == GRUB_PARSER_STATE_QVARNAME2)
+		    {
+		      nextchar (state);
+		      state->state = newstate;
+		    }
 		  break;
 		}
 
@@ -378,7 +380,6 @@
 
 	  buffer[bufpos++] = 0;
 
-	  state->state = newstate;
 	  yylval->arg = grub_script_arg_add (parsestate, yylval->arg,
 					     GRUB_SCRIPT_ARG_TYPE_VAR, buffer);
 	  grub_dprintf ("scripting", "vartoken=`%s'\n", buffer);