merge revision(s) 34415:

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 955f3ce49b..b6f678fa74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 15 04:49:23 2012  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* 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@ruby-lang.org>
 
 	* lib/rake/file_list.rb (Rake::FileList#egrep): there is no need to
diff --git a/parse.y b/parse.y
index ae48d383c8..b0da1b7cb6 100644
--- a/parse.y
+++ b/parse.y
@@ -5153,7 +5153,7 @@ debug_lines(const char *f)
     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 @@ coverage(const char *f, int n)
 {
     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;
diff --git a/version.h b/version.h
index 7017361e78..ddcbcb122b 100644
--- a/version.h
+++ b/version.h
@@ -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"