summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-31 14:24:22 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-31 14:24:22 +0000
commitab05a6ddf7f0ef6c345ffa288adab0c7e6dca1d3 (patch)
tree2cabedbe525e8089bc453650392d9b76cf91a8e1
parent559ea4702023fedaa40787641d41f99115f9418b (diff)
* object.c (rb_obj_cmp): [DOC] patched by Keith Bennett
<kbennett AT verisign.com>. [ruby-core:57887] [Backport #9024] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@43485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--object.c3
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f871a50e74..d7347b1b20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 31 23:22:35 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * object.c (rb_obj_cmp): [DOC] patched by Keith Bennett
+ <kbennett AT verisign.com>. [ruby-core:57887] [Backport #9024]
+
Thu Oct 31 23:10:30 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* test/dl/test_base.rb: {libc, libm} detection now handle GNU/Hurd
diff --git a/object.c b/object.c
index 59611fd2d6..0a0b260adb 100644
--- a/object.c
+++ b/object.c
@@ -1234,7 +1234,8 @@ rb_obj_not_match(VALUE obj1, VALUE obj2)
* call-seq:
* obj <=> other -> 0 or nil
*
- * Returns 0 if obj === other, otherwise nil.
+ * Returns 0 if +obj+ and +other+ are the same object
+ * or <code>obj == other</code>, otherwise nil.
*/
static VALUE
rb_obj_cmp(VALUE obj1, VALUE obj2)
diff --git a/version.h b/version.h
index 504b890a78..04302bc549 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 473
+#define RUBY_PATCHLEVEL 474
#define RUBY_RELEASE_DATE "2013-10-31"
#define RUBY_RELEASE_YEAR 2013