matz	2009-08-13 12:03:20 +0900 (Thu, 13 Aug 2009)

  New Revision: 24519

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

  Log:
    revert r24507.  [ruby-dev:39073]

  Modified files:
    trunk/ChangeLog
    trunk/sprintf.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24518)
+++ ChangeLog	(revision 24519)
@@ -48,11 +48,6 @@
 
 	* configure.in (rb_cv_broken_crypt): needs more checks.
 
-Wed Aug 12 08:39:15 2009  Yukihiro Matsumoto  <matz@r...>
-
-	* sprintf.c (rb_str_format): should preserve format encoding
-	  before raising CompatibilityError.  [ruby-list:46274]
-
 Wed Aug 12 07:41:31 2009  NARUSE, Yui  <naruse@r...>
 
 	* encoding.c (rb_enc_compatible): If a string is empty and
Index: sprintf.c
===================================================================
--- sprintf.c	(revision 24518)
+++ sprintf.c	(revision 24519)
@@ -677,7 +677,7 @@
 				      (cr == ENC_CODERANGE_UNKNOWN ?
 				       ENC_CODERANGE_BROKEN : (coderange = cr)));
 		}
-		enc = rb_enc_check((RSTRING_LEN(result) == 0 ? fmt : result), str);
+		enc = rb_enc_check(result, str);
 		if (flags&(FPREC|FWIDTH)) {
 		    slen = rb_enc_strlen(RSTRING_PTR(str),RSTRING_END(str),enc);
 		    if (slen < 0) {

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