merges r23889 from trunk into ruby_1_9_1.

--
* file.c (file_expand_path): should copy original encoding.
  [ruby-dev:38612]

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

1 files changed, 1 insertions, 1 deletions

diff --git a/file.c b/file.c
index a4082b9b1f..050cbd2d64 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 */