aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/stringio/stringio.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8137c3b3bd..51ec6b4eae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec 12 15:41:03 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/stringio/stringio.c (strio_truncate): fix typo. patched by
+ Nick Howard <ndh AT baroquebobcat.com>.
+ https://github.com/ruby/ruby/pull/65
+
Sun Dec 11 12:19:17 2011 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/imap.rb: includes the sequence number of UID in a error
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 5aa2d27ef3..ad18644a43 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -1341,7 +1341,7 @@ strio_truncate(VALUE self, VALUE len)
long l = NUM2LONG(len);
long plen = RSTRING_LEN(string);
if (l < 0) {
- error_inval("negative legnth");
+ error_inval("negative length");
}
rb_str_resize(string, l);
if (plen < l) {