shyouhei	2008-06-22 00:11:24 +0900 (Sun, 22 Jun 2008)

  New Revision: 17508

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/lib/delegate.rb
    branches/ruby_1_8_6/version.h

  Log:
    merge revision(s) 16752:
    * lib/delegate.rb (DelegateClass, Delegator#respond_to?):
      respond_to? should now take optional second argument; submitted
      by Jeremy Kemper <jeremy at bitsweat.net> in [ruby-core:17045].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17508&r2=17507&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17508&r2=17507&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/lib/delegate.rb?r1=17508&r2=17507&diff_format=u

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17507)
+++ ruby_1_8_6/ChangeLog	(revision 17508)
@@ -1,3 +1,9 @@
+Sun Jun 22 00:09:20 2008  Akinori MUSHA  <knu@i...>
+
+	* lib/delegate.rb (DelegateClass, Delegator#respond_to?):
+	  respond_to? should now take optional second argument; submitted
+	  by Jeremy Kemper <jeremy at bitsweat.net> in [ruby-core:17045].
+
 Fri Jun 20 18:24:18 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (rb_str_buf_append): should infect.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17507)
+++ ruby_1_8_6/version.h	(revision 17508)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-06-20"
+#define RUBY_RELEASE_DATE "2008-06-22"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080620
-#define RUBY_PATCHLEVEL 230
+#define RUBY_RELEASE_CODE 20080622
+#define RUBY_PATCHLEVEL 231
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 22
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_6/lib/delegate.rb
===================================================================
--- ruby_1_8_6/lib/delegate.rb	(revision 17507)
+++ ruby_1_8_6/lib/delegate.rb	(revision 17508)
@@ -164,9 +164,9 @@
   # Checks for a method provided by this the delegate object by fowarding the 
   # call through \_\_getobj\_\_.
   # 
-  def respond_to?(m)
+  def respond_to?(m, include_private = false)
     return true if super
-    return self.__getobj__.respond_to?(m)
+    return self.__getobj__.respond_to?(m, include_private)
   end
 
   #
@@ -271,9 +271,9 @@
       end
       @_dc_obj.__send__(m, *args)
     end
-    def respond_to?(m)  # :nodoc:
+    def respond_to?(m, include_private = false)  # :nodoc:
       return true if super
-      return @_dc_obj.respond_to?(m)
+      return @_dc_obj.respond_to?(m, include_private)
     end
     def __getobj__  # :nodoc:
       @_dc_obj

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