yugui	2009-05-04 21:31:16 +0900 (Mon, 04 May 2009)

  New Revision: 23341

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

  Log:
    merges r23186 and r23187 from trunk into ruby_1_9_1.
    --
    * sprintf.c (rb_str_format): check encoding compatibility only on
      real parts.
    --
    * sprintf.c (rb_str_format): optimize previous commit.
      [ruby-list:45954]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/sprintf.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23340)
+++ ruby_1_9_1/ChangeLog	(revision 23341)
@@ -1,3 +1,13 @@
+Mon Apr 13 11:35:55 2009  NARUSE, Yui  <naruse@r...>
+
+	* sprintf.c (rb_str_format): optimize previous commit.
+	  [ruby-list:45954]
+
+Mon Apr 13 10:58:54 2009  NARUSE, Yui  <naruse@r...>
+
+	* sprintf.c (rb_str_format): check encoding compatibility only on
+	  real parts.
+
 Sun Apr 19 13:17:25 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* gem_prelude.rb (Gem::QuickLoader#push_gem_version_on_load_path):
Index: ruby_1_9_1/sprintf.c
===================================================================
--- ruby_1_9_1/sprintf.c	(revision 23340)
+++ ruby_1_9_1/sprintf.c	(revision 23341)
@@ -652,6 +652,7 @@
 		str = rb_obj_as_string(arg);
 		if (OBJ_TAINTED(str)) tainted = 1;
 		len = RSTRING_LEN(str);
+		rb_str_set_len(result, blen);
 		enc = rb_enc_check(result, str);
 		if (flags&(FPREC|FWIDTH)) {
 		    slen = rb_enc_strlen(RSTRING_PTR(str),RSTRING_END(str),enc);

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