yugui	2009-07-13 17:08:02 +0900 (Mon, 13 Jul 2009)

  New Revision: 24079

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

  Log:
    merges r24015 from trunk into ruby_1_9_1.
    --
    * marshal.c (r_object0): set encoding only if the encoding is not US-ASCII.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/marshal.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24078)
+++ ruby_1_9_1/ChangeLog	(revision 24079)
@@ -1,3 +1,8 @@
+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 11:41:39 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/ruby.h (rb_obj_{untrust,untrusted,trust}): added
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24078)
+++ ruby_1_9_1/version.h	(revision 24079)
@@ -4,7 +4,7 @@
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
-#define RUBY_PATCHLEVEL 228
+#define RUBY_PATCHLEVEL 229
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
 #define RUBY_RELEASE_DAY 12
Index: ruby_1_9_1/marshal.c
===================================================================
--- ruby_1_9_1/marshal.c	(revision 24078)
+++ ruby_1_9_1/marshal.c	(revision 24079)
@@ -1376,7 +1376,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/