diff -r 6892c5562950 src/octave.gperf
--- a/src/octave.gperf	Thu Jul 08 13:51:37 2010 +0200
+++ b/src/octave.gperf	Fri Jul 09 12:12:45 2010 +0200
@@ -32,7 +32,6 @@
   catch_kw,
   classdef_kw,
   continue_kw,
-  do_kw,
   else_kw,
   elseif_kw,
   end_kw,
@@ -63,7 +62,6 @@
   static_kw,
   switch_kw,
   try_kw,
-  until_kw,
   unwind_protect_kw,
   unwind_protect_cleanup_kw,
   while_kw
@@ -76,7 +74,6 @@
 catch, CATCH, catch_kw
 classdef, CLASSDEF, classdef_kw
 continue, CONTINUE, continue_kw
-do, DO, do_kw
 else, ELSE, else_kw
 elseif, ELSEIF, elseif_kw
 end, END, end_kw
@@ -106,7 +103,6 @@
 static, STATIC, static_kw
 switch, SWITCH, switch_kw
 try, TRY, try_kw
-until, UNTIL, until_kw
 unwind_protect, UNWIND, unwind_protect_kw
 unwind_protect_cleanup, CLEANUP, unwind_protect_cleanup_kw
 while, WHILE, while_kw
diff -r 6892c5562950 src/lex.ll
--- a/src/lex.ll	Thu Jul 08 13:51:37 2010 +0200
+++ b/src/lex.ll	Fri Jul 09 12:22:14 2010 +0200
@@ -1462,7 +1462,6 @@
         case elseif_kw:
         case global_kw:
         case static_kw:
-        case until_kw:
           break;
 
         case end_kw:
@@ -1538,12 +1537,6 @@
           lexer_flags.looping++;
           break;
 
-        case do_kw:
-          lexer_flags.at_beginning_of_statement = true;
-          promptflag--;
-          lexer_flags.looping++;
-          break;
-
         case try_kw:
         case unwind_protect_kw:
           lexer_flags.at_beginning_of_statement = true;