nobu	2012-03-15 14:49:34 +0900 (Thu, 15 Mar 2012)

  New Revision: 35032

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35032

  Log:
    * string.c (rb_str_conv_enc_opts): default to original encoding.

  Modified files:
    trunk/ChangeLog
    trunk/string.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 35031)
+++ ChangeLog	(revision 35032)
@@ -1,3 +1,7 @@
+Thu Mar 15 14:49:31 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (rb_str_conv_enc_opts): default to original encoding.
+
 Thu Mar 15 13:47:17 2012  NAKAMURA Usaku  <usa@r...>
 
 	* hash.c (env_str_new, rb_f_getenv, env_fetch): use rb_str_conv_enc()
Index: string.c
===================================================================
--- string.c	(revision 35031)
+++ string.c	(revision 35032)
@@ -483,6 +483,7 @@
     unsigned char *dp;
 
     if (!to) return str;
+    if (!from) from = rb_enc_get(str);
     if (from == to) return str;
     if ((rb_enc_asciicompat(to) && ENC_CODERANGE(str) == ENC_CODERANGE_7BIT) ||
 	to == rb_ascii8bit_encoding()) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/