usa	2013-01-15 15:55:24 +0900 (Tue, 15 Jan 2013)

  New Revision: 38826

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

  Log:
    merge revision(s) 36272: [Backport #7634]
    
    * object.c (Init_Object):  Added RDoc location pointers for
      Kernel#methods, Kernel#protected_methods, Kernel#private_methods and
      Kernel#public_methods.  [Bug #6666]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/object.c
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 38825)
+++ ruby_1_9_3/ChangeLog	(revision 38826)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Tue Jan 15 15:55:09 2013  Eric Hodel  <drbrain@s...>
+
+	* object.c (Init_Object):  Added RDoc location pointers for
+	  Kernel#methods, Kernel#protected_methods, Kernel#private_methods and
+	  Kernel#public_methods.  [Bug #6666]
+
 Fri Jan 11 17:12:44 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_core.h (rb_iseq_t): move flip_cnt from struct iseq_compile_data,
Index: ruby_1_9_3/object.c
===================================================================
--- ruby_1_9_3/object.c	(revision 38825)
+++ ruby_1_9_3/object.c	(revision 38826)
@@ -2703,11 +2703,11 @@ Init_Object(void) https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/object.c#L2703
 
     rb_define_method(rb_mKernel, "to_s", rb_any_to_s, 0);
     rb_define_method(rb_mKernel, "inspect", rb_obj_inspect, 0);
-    rb_define_method(rb_mKernel, "methods", rb_obj_methods, -1);
+    rb_define_method(rb_mKernel, "methods", rb_obj_methods, -1); /* in class.c */
     rb_define_method(rb_mKernel, "singleton_methods", rb_obj_singleton_methods, -1); /* in class.c */
-    rb_define_method(rb_mKernel, "protected_methods", rb_obj_protected_methods, -1);
-    rb_define_method(rb_mKernel, "private_methods", rb_obj_private_methods, -1);
-    rb_define_method(rb_mKernel, "public_methods", rb_obj_public_methods, -1);
+    rb_define_method(rb_mKernel, "protected_methods", rb_obj_protected_methods, -1); /* in class.c */
+    rb_define_method(rb_mKernel, "private_methods", rb_obj_private_methods, -1); /* in class.c */
+    rb_define_method(rb_mKernel, "public_methods", rb_obj_public_methods, -1); /* in class.c */
     rb_define_method(rb_mKernel, "instance_variables", rb_obj_instance_variables, 0); /* in variable.c */
     rb_define_method(rb_mKernel, "instance_variable_get", rb_obj_ivar_get, 1);
     rb_define_method(rb_mKernel, "instance_variable_set", rb_obj_ivar_set, 2);
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 38825)
+++ ruby_1_9_3/version.h	(revision 38826)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 367
+#define RUBY_PATCHLEVEL 368
 
-#define RUBY_RELEASE_DATE "2013-01-11"
+#define RUBY_RELEASE_DATE "2013-01-15"
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"
 

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r36272


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