aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--array.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ea1f3532b4..39f0db97fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun 4 12:47:54 SGT 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * array.c: Revert r50763. because "reentered" is not typo.
+
Thu Jun 4 11:12:29 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* ext/win32ole/win32ole.c: fix a typo. Patch by @davydovanton
diff --git a/array.c b/array.c
index fc847e71a8..32f9f9ebe4 100644
--- a/array.c
+++ b/array.c
@@ -2382,7 +2382,7 @@ static VALUE
sort_reentered(VALUE ary)
{
if (RBASIC(ary)->klass) {
- rb_raise(rb_eRuntimeError, "sort re-entered");
+ rb_raise(rb_eRuntimeError, "sort reentered");
}
return Qnil;
}