naruse	2012-02-15 05:01:09 +0900 (Wed, 15 Feb 2012)

  New Revision: 34600

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

  Log:
    merge revision(s) 34415:
    
    * parse.y (debug_lines, coverage): set file path encoding for coverage
      result.  [ruby-dev:44950]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/parse.y
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34599)
+++ ruby_1_9_3/ChangeLog	(revision 34600)
@@ -1,3 +1,8 @@
+Wed Feb 15 04:49:23 2012  Yusuke Endoh  <mame@t...>
+
+	* parse.y (debug_lines, coverage): set file path encoding for coverage
+	  result.  [ruby-dev:44950]
+
 Tue Feb 14 16:57:11 2012  NAKAMURA Usaku  <usa@r...>
 
 	* lib/rake/file_list.rb (Rake::FileList#egrep): there is no need to
Index: ruby_1_9_3/parse.y
===================================================================
--- ruby_1_9_3/parse.y	(revision 34599)
+++ ruby_1_9_3/parse.y	(revision 34600)
@@ -5153,7 +5153,7 @@
     if (rb_const_defined_at(rb_cObject, script_lines)) {
 	VALUE hash = rb_const_get_at(rb_cObject, script_lines);
 	if (TYPE(hash) == T_HASH) {
-	    VALUE fname = rb_str_new2(f);
+	    VALUE fname = rb_external_str_new_with_enc(f, strlen(f), rb_filesystem_encoding());
 	    VALUE lines = rb_ary_new();
 	    rb_hash_aset(hash, fname, lines);
 	    return lines;
@@ -5167,7 +5167,7 @@
 {
     VALUE coverages = rb_get_coverages();
     if (RTEST(coverages) && RBASIC(coverages)->klass == 0) {
-	VALUE fname = rb_str_new2(f);
+	VALUE fname = rb_external_str_new_with_enc(f, strlen(f), rb_filesystem_encoding());
 	VALUE lines = rb_ary_new2(n);
 	int i;
 	RBASIC(lines)->klass = 0;
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34599)
+++ ruby_1_9_3/version.h	(revision 34600)
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 110
+#define RUBY_PATCHLEVEL 111
 
-#define RUBY_RELEASE_DATE "2012-02-14"
+#define RUBY_RELEASE_DATE "2012-02-15"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"
 

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