yugui	2009-10-25 23:39:21 +0900 (Sun, 25 Oct 2009)

  New Revision: 25471

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25471

  Log:
    merges r24479 from trunk into ruby_1_9_1.
    --
    * ext/ripper/eventids2.c (token_to_eventid): added
      keyword_do_LAMBDA.  [ruby-dev:39049]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/ripper/eventids2.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 25470)
+++ ruby_1_9_1/ChangeLog	(revision 25471)
@@ -1,3 +1,8 @@
+Sun Aug  9 07:25:07 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/ripper/eventids2.c (token_to_eventid): added
+	  keyword_do_LAMBDA.  [ruby-dev:39049]
+
 Fri Aug  7 03:22:50 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (rb_exc_raise, rb_exc_fatal): nil is used to reraise.
Index: ruby_1_9_1/ext/ripper/eventids2.c
===================================================================
--- ruby_1_9_1/ext/ripper/eventids2.c	(revision 25470)
+++ ruby_1_9_1/ext/ripper/eventids2.c	(revision 25471)
@@ -185,6 +185,7 @@
     {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},
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 25470)
+++ ruby_1_9_1/version.h	(revision 25471)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/