aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--enum.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b878f7cdcc..d0fb13541d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 4 10:16:57 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * enum.c: Fix typo in slice_after's exception message.
+ [fix GH-842][ci skip] Patch by @jsyeo
+
Wed Mar 4 10:15:37 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* doc/syntax/methods.rdoc: add some missing spaces and
diff --git a/enum.c b/enum.c
index 6c68240f0e..ca939bef61 100644
--- a/enum.c
+++ b/enum.c
@@ -3234,7 +3234,7 @@ enum_slice_after(int argc, VALUE *argv, VALUE enumerable)
if (rb_block_given_p()) {
if (0 < argc)
- rb_raise(rb_eArgError, "both pattan and block are given");
+ rb_raise(rb_eArgError, "both pattern and block are given");
pred = rb_block_proc();
}
else {