From 5015e057fbd45b168f1a742ddccbf81756ab1d12 Mon Sep 17 00:00:00 2001 From: hsbt Date: Thu, 4 Jun 2015 04:49:26 +0000 Subject: [PATCH] * array.c: Revert r50763. because "reentered" is not typo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50767 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ array.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * array.c: Revert r50763. because "reentered" is not typo. + Thu Jun 4 11:12:29 2015 SHIBATA Hiroshi * 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; }