Permalink
Browse files

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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
1 parent 3468cd1 commit 00decfdbcaddf72e225571e6f5569ff4a03a87c0 @unak unak committed Jan 15, 2013
Showing with 13 additions and 7 deletions.
  1. +6 −0 ChangeLog
  2. +4 −4 object.c
  3. +3 −3 version.h
View
6 ChangeLog
@@ -1,3 +1,9 @@
+Tue Jan 15 15:55:09 2013 Eric Hodel <drbrain@segment7.net>
+
+ * 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@ruby-lang.org>
* vm_core.h (rb_iseq_t): move flip_cnt from struct iseq_compile_data,
View
8 object.c
@@ -2703,11 +2703,11 @@ Init_Object(void)
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);
View
6 version.h
@@ -1,10 +1,10 @@
#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"

0 comments on commit 00decfd

Please sign in to comment.