From aa2d3e79a3639a45022a545310a1ca5f5b4e5673 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 12 Jul 2009 14:44:37 +0000 Subject: merges r23889 from trunk into ruby_1_9_1. -- * file.c (file_expand_path): should copy original encoding. [ruby-dev:38612] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'file.c') diff --git a/file.c b/file.c index a4082b9b1..050cbd2d6 100644 --- a/file.c +++ b/file.c @@ -2665,7 +2665,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result) memcpy(p, s, 2); p += 2; s += 2; - rb_enc_associate_index(result, rb_usascii_encindex()); + rb_enc_copy(result, fname); } else { /* specified drive, but not full path */ -- cgit