aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-04 01:54:41 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-04 01:54:41 +0000
commitdf55f4170a77315e63d945cdfde8f305d9dc0590 (patch)
tree813efac3a966387033258c89fc8d6d0060b912a6
parent14cbd61f0104a37c67a1191b99c1a37dddfe7232 (diff)
downloadruby-df55f4170a77315e63d945cdfde8f305d9dc0590.tar.gz
* array.c: fix a typo. Patch by @manish-shrivastava
[fix GH-922] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50763 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--array.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6aeadc16e8..b0902bf74b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 4 10:54:30 2015 Eric Wong <e@80x24.org>
+
+ * array.c: fix a typo. Patch by @manish-shrivastava
+ [fix GH-922]
+
Thu Jun 4 09:52:02 2015 Eric Wong <e@80x24.org>
* ext/openssl/lib/openssl/ssl.rb: use io/nonblock instead of fcntl
diff --git a/array.c b/array.c
index 32f9f9ebe4..fc847e71a8 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 reentered");
+ rb_raise(rb_eRuntimeError, "sort re-entered");
}
return Qnil;
}