yugui	2008-11-11 20:02:06 +0900 (Tue, 11 Nov 2008)

  New Revision: 20203

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

  Log:
    merges r20169 from trunk into ruby_1_9_1.
    * lib/delegate.rb (Delegator.delegating_block): should not refer
      DelegateClass specific @delegate_dc_obj.  a patch from Erik
      Hollensbe in [ruby-core:19671].

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/delegate.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20202)
+++ ruby_1_9_1/ChangeLog	(revision 20203)
@@ -1,3 +1,9 @@
+Mon Nov 10 10:50:43 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/delegate.rb (Delegator.delegating_block): should not refer
+	  DelegateClass specific @delegate_dc_obj.  a patch from Erik
+	  Hollensbe in [ruby-core:19671].
+
 Sun Nov  9 13:04:52 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* struct.c (rb_struct_initialize_m): avoid unnecessary array
Index: ruby_1_9_1/lib/delegate.rb
===================================================================
--- ruby_1_9_1/lib/delegate.rb	(revision 20202)
+++ ruby_1_9_1/lib/delegate.rb	(revision 20203)
@@ -234,7 +234,7 @@
 def Delegator.delegating_block(mid)
   lambda do |*args, &block|
     begin
-      @delegate_dc_obj.__send__(mid, *args, &block)
+      __getobj__.__send__(mid, *args, &block)
     rescue
       re = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}:/o
       $!.backtrace.delete_if {|t| re =~ t}

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