summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-11 22:52:39 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-11 22:52:39 +0000
commit3ccf45d5df944aa274ee5af054bf89b211a6ffa2 (patch)
treed8c42d9e1b2958a8f0c5abc758dbf59627f9f997 /ChangeLog
parent8130e821357852736f3e3cfed47ddab40c6b7b82 (diff)
downloadruby-3ccf45d5df944aa274ee5af054bf89b211a6ffa2.tar.gz
ruby-3ccf45d5df944aa274ee5af054bf89b211a6ffa2.tar.xz
ruby-3ccf45d5df944aa274ee5af054bf89b211a6ffa2.zip
* encoding.c (rb_enc_compatible): If a string is empty and
other's encoding is US-ASCII, returns the empty string's encoding. [ruby-list:46274] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 62bcbdd76..dcd2bbe11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 12 07:41:31 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * encoding.c (rb_enc_compatible): If a string is empty and
+ other's encoding is US-ASCII, returns the empty string's encoding.
+ [ruby-list:46274]
+
Wed Aug 12 07:38:12 2009 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (is_data_encoding): fix condition.