summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-05 02:36:11 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-05 02:36:11 +0000
commitfba7863392bdf1c968f574de129c14ae30784f88 (patch)
tree97b3b0e219ab59de0ff41c134b965124697e88db /ChangeLog
parent28e26e7f658bce1d677564aa04fb89833ca02d12 (diff)
merges r25353 and r25362 from trunk into ruby_1_9_1.
-- * lib/csv.rb (CSV#read_to_char): set encoding and verify data which read from io before encode it to @encoding. * lib/csv.rb (CSV#raw_encoding): add to get @io's encoding. * lib/csv.rb (CSV#read_io): add to read string and set @io's encoding. -- * lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io doesn't have encoding. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog15
1 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 98c1a378cc..9dd65f7ddc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Fri Oct 16 12:03:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/csv.rb (CSV#raw_encoding): returns ASCII-8BIT when the io
+ doesn't have encoding.
+
+Fri Oct 16 03:15:52 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * lib/csv.rb (CSV#read_to_char): set encoding and verify data
+ which read from io before encode it to @encoding.
+
+ * lib/csv.rb (CSV#raw_encoding): add to get @io's encoding.
+
+ * lib/csv.rb (CSV#read_io): add to read string and set @io's
+ encoding.
+
Mon Sep 28 22:33:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dln.c (aix_loaderror): needs format string.