matz	2007-12-19 15:15:35 +0900 (Wed, 19 Dec 2007)

  New Revision: 14317

  Modified files:
    trunk/ChangeLog
    trunk/string.c

  Log:
    * string.c (rb_str_justify): should propagate encoding from pad
      string too.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=14317&r2=14316
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14317&r2=14316

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14316)
+++ ChangeLog	(revision 14317)
@@ -1,3 +1,8 @@
+Wed Dec 19 15:13:20 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* string.c (rb_str_justify): should propagate encoding from pad
+	  string too.
+
 Wed Dec 19 13:57:43 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (TIMEZONE_VOID): check whether timezone requires zero
Index: string.c
===================================================================
--- string.c	(revision 14316)
+++ string.c	(revision 14317)
@@ -5023,7 +5023,7 @@
     width = NUM2LONG(w);
     if (argc == 2) {
 	StringValue(pad);
-	rb_enc_check(str, pad);
+	enc = rb_enc_check(str, pad);
 	f = RSTRING_PTR(pad);
 	flen = RSTRING_LEN(pad);
 	fclen = str_strlen(pad, enc);

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