matz	2010-02-13 15:03:06 +0900 (Sat, 13 Feb 2010)

  New Revision: 26658

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

  Log:
    * marshal.c (id2encidx): duplicated entry for encoding name.
      [ruby-dev:40388]

  Modified files:
    trunk/ChangeLog
    trunk/marshal.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26657)
+++ ChangeLog	(revision 26658)
@@ -1,3 +1,8 @@
+Sat Feb 13 15:01:24 2010  Yukihiro Matsumoto  <matz@r...>
+
+	* marshal.c (id2encidx): duplicated entry for encoding name.
+	  [ruby-dev:40388]
+
 Sat Feb 13 12:17:52 2010  Tanaka Akira  <akr@f...>
 
 	* lib/tempfile.rb (Tempfile::Remover): new class to replace
Index: marshal.c
===================================================================
--- marshal.c	(revision 26657)
+++ marshal.c	(revision 26658)
@@ -1130,7 +1130,6 @@
 {
     if (id == rb_id_encoding()) {
 	int idx = rb_enc_find_index(StringValueCStr(val));
-	r_entry(val, arg);
 	return idx;
     }
     else if (id == rb_intern("E")) {

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