matz	2008-09-23 16:19:17 +0900 (Tue, 23 Sep 2008)

  New Revision: 19471

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

  Log:
    * ext/ripper/eventids2.c (token_to_eventid): supper __ENCODING__
      keyword.  [ruby-dev:36478]

  Modified files:
    trunk/ChangeLog
    trunk/ext/ripper/eventids2.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19470)
+++ ChangeLog	(revision 19471)
@@ -1,3 +1,8 @@
+Tue Sep 23 16:17:54 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* ext/ripper/eventids2.c (token_to_eventid): supper __ENCODING__
+	  keyword.  [ruby-dev:36478]
+
 Tue Sep 23 15:30:53 2008  Koichi Sasada  <ko1@a...>
 
 	* common.mk, hash.c: remove unused inclusion.
Index: ext/ripper/eventids2.c
===================================================================
--- ext/ripper/eventids2.c	(revision 19470)
+++ ext/ripper/eventids2.c	(revision 19471)
@@ -182,6 +182,7 @@
     {keyword_yield,	&ripper_id_kw},
     {keyword__FILE__,	&ripper_id_kw},
     {keyword__LINE__,	&ripper_id_kw},
+    {keyword__ENCODING__, &ripper_id_kw},
     {keyword_BEGIN,	&ripper_id_kw},
     {keyword_END,	&ripper_id_kw},
     {tAMPER,		&ripper_id_op},

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