2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 536bc96b3d..0c5a6b7210 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May  1 17:55:58 2001  Yukihiro Matsumoto  <[email protected]>
+
+	* parse.y (yylex): lex_state after RESCUE_MOD should be EXPR_BEG.
+
 Tue May  1 03:36:50 2001  Akinori MUSHA  <[email protected]>
 
 	* sample/irb.rb, lib/irb.rb, lib/irb/*, doc/irb/*: Merge from irb
diff --git a/parse.y b/parse.y
index bf611f7479..bb0d3bbf91 100644
--- a/parse.y
+++ b/parse.y
@@ -3624,7 +3624,13 @@ yylex()
 			if (CMDARG_P()) return kDO_BLOCK;
 			return kDO;
 		    }
-		    return kw->id[state != EXPR_BEG];
+		    if (state == EXPR_BEG)
+			return kw->id[0];
+		    else {
+			if (kw->id[0] != kw->id[1])
+			    lex_state = EXPR_BEG;
+			return kw->id[1];
+		    }
 		}
 	    }