usa	2014-10-15 15:39:24 +0900 (Wed, 15 Oct 2014)

  New Revision: 47929

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

  Log:
    merge revision(s) 42060: [Backport #9915]
    
    * ext/pathname/pathname.c (path_inspect): use PRIsVALUE to preserve
      the result encoding.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/pathname/pathname.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 47928)
+++ ruby_2_0_0/ChangeLog	(revision 47929)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Oct 15 15:35:39 2014  Kazuki Tsujimoto  <kazuki@c...>
+
+	* ext/pathname/pathname.c (path_inspect): use PRIsVALUE to preserve
+	  the result encoding.
+
 Wed Sep 17 15:09:16 2014  Natalie Weizenbaum  <nweiz@g...>
 
 	* ext/pathname/lib/pathname.rb (SAME_PATHS):
Index: ruby_2_0_0/ext/pathname/pathname.c
===================================================================
--- ruby_2_0_0/ext/pathname/pathname.c	(revision 47928)
+++ ruby_2_0_0/ext/pathname/pathname.c	(revision 47929)
@@ -183,7 +183,7 @@ path_inspect(VALUE self) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/pathname/pathname.c#L183
 {
     const char *c = rb_obj_classname(self);
     VALUE str = get_strpath(self);
-    return rb_sprintf("#<%s:%s>", c, RSTRING_PTR(str));
+    return rb_sprintf("#<%s:%"PRIsVALUE">", c, str);
 }
 
 /*
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 47928)
+++ ruby_2_0_0/version.h	(revision 47929)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2014-09-19"
-#define RUBY_PATCHLEVEL 576
+#define RUBY_RELEASE_DATE "2014-10-15"
+#define RUBY_PATCHLEVEL 577
 
 #define RUBY_RELEASE_YEAR 2014
-#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_MONTH 10
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42060


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