From 3ccf45d5df944aa274ee5af054bf89b211a6ffa2 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 11 Aug 2009 22:52:39 +0000
Subject: * 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
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

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.
-- 
cgit