naruse	2009-07-10 14:51:17 +0900 (Fri, 10 Jul 2009)

  New Revision: 24015

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

  Log:
    * marshal.c (r_object0): set encoding only if the encoding is not US-ASCII.

  Modified files:
    trunk/ChangeLog
    trunk/marshal.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24014)
+++ ChangeLog	(revision 24015)
@@ -1,3 +1,7 @@
+Fri Jul 10 14:41:34 2009  NARUSE, Yui  <naruse@r...>
+
+	* marshal.c (r_object0): set encoding only if the encoding
+	  is not US-ASCII.
 Fri Jul 10 14:44:03 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* random.c (struct MT): ruby already assumes int has 32bit a
Index: marshal.c
===================================================================
--- marshal.c	(revision 24014)
+++ marshal.c	(revision 24015)
@@ -1398,7 +1398,8 @@
 		r_ivar(v, arg);
 		*ivp = Qfalse;
 	    }
-	    rb_enc_copy(str, v);
+	    if (rb_enc_get_index(v) != rb_usascii_encindex())
+		rb_enc_copy(str, v);
 	    if (rb_enc_get_index(str) != rb_utf8_encindex()) {
 #define f_gsub_bang(x,y,z) rb_funcall(x, rb_intern("gsub!"), 2, y, z)
 		f_gsub_bang(str, rb_reg_new("\\\\u", 3, 0), rb_usascii_str_new_cstr("u"));

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