usa	2016-04-22 14:04:37 +0900 (Fri, 22 Apr 2016)

  New Revision: 54672

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54672

  Log:
    merge revision(s) 50338: [Backport #12253]
    
    tkutil.c: revert r48250
    
    * ext/tk/tkutil/tkutil.c (Init_tkutil): TkUtil::CallbackSubst and
      TkUtil::CallbackSubst::Info need the default allocator.
      [ruby-list:50115]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ext/tk/tkutil/tkutil.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54671)
+++ ruby_2_2/version.h	(revision 54672)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-04-22"
-#define RUBY_PATCHLEVEL 293
+#define RUBY_PATCHLEVEL 294
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_2/ext/tk/tkutil/tkutil.c
===================================================================
--- ruby_2_2/ext/tk/tkutil/tkutil.c	(revision 54671)
+++ ruby_2_2/ext/tk/tkutil/tkutil.c	(revision 54672)
@@ -1774,10 +1774,10 @@ Init_tkutil(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/tk/tkutil/tkutil.c#L1774
     ID_call = rb_intern("call");
 
     /* --------------------- */
-    cCB_SUBST = rb_define_class_under(mTK, "CallbackSubst", rb_cData);
+    cCB_SUBST = rb_define_class_under(mTK, "CallbackSubst", rb_cObject);
     rb_define_singleton_method(cCB_SUBST, "inspect", cbsubst_inspect, 0);
 
-    cSUBST_INFO = rb_define_class_under(cCB_SUBST, "Info", rb_cData);
+    cSUBST_INFO = rb_define_class_under(cCB_SUBST, "Info", rb_cObject);
     rb_define_singleton_method(cSUBST_INFO, "inspect", substinfo_inspect, 0);
 
     ID_SUBST_INFO = rb_intern("SUBST_INFO");

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50338


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