merges r28105 from trunk into ruby_1_9_2.

--
* file.c (file_expand_path): Refix r28102: this breaks
  r28039. test for [ruby-dev:41429] is added. [ruby-core:30516]

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

1 files changed, 3 insertions, 2 deletions

diff --git a/file.c b/file.c
index 1d9ad50840..7bb4e0bdc5 100644
--- a/file.c
+++ b/file.c
@@ -2887,7 +2887,8 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
 		xfree(dir);
 		rb_enc_associate_index(result, rb_filesystem_encindex());
 	    }
-	    else rb_enc_check(result, fname);
+	    else
+		rb_enc_associate(result, rb_enc_check(result, fname));
 	    p = chompdirsep(skiproot(buf));
 	    s += 2;
 	}
@@ -2897,7 +2898,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
 	if (!NIL_P(dname)) {
 	    file_expand_path(dname, Qnil, abs_mode, result);
 	    BUFINIT();
-	    rb_enc_check(result, fname);
+	    rb_enc_associate(result, rb_enc_check(result, fname));
 	}
 	else {
 	    char *dir = my_getcwd();