merges r24479 from trunk into ruby_1_9_1.

--
* ext/ripper/eventids2.c (token_to_eventid): added
  keyword_do_LAMBDA.  [ruby-dev:39049]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 4b7e28345e..7dd4f1b47a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug  9 07:25:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/ripper/eventids2.c (token_to_eventid): added
+	  keyword_do_LAMBDA.  [ruby-dev:39049]
+
 Fri Aug  7 03:22:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_exc_raise, rb_exc_fatal): nil is used to reraise.
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c
index a557a41fa7..8b0d9c3757 100644
--- a/ext/ripper/eventids2.c
+++ b/ext/ripper/eventids2.c
@@ -185,6 +185,7 @@ static const struct token_assoc {
     {keyword__ENCODING__, &ripper_id_kw},
     {keyword_BEGIN,	&ripper_id_kw},
     {keyword_END,	&ripper_id_kw},
+    {keyword_do_LAMBDA,	&ripper_id_kw},
     {tAMPER,		&ripper_id_op},
     {tANDOP,		&ripper_id_op},
     {tAREF,		&ripper_id_op},
diff --git a/version.h b/version.h
index 36f267d598..7bd702eda9 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 281
+#define RUBY_PATCHLEVEL 282
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1