merges r23670 from trunk into ruby_1_9_1.

--
* file.c (file_expand_path): associate the input encoding when
  copying an absolute path.  [ruby-dev:38594]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f4fae9ea5..1d633b954 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 12 14:56:50 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): associate the input encoding when
+	  copying an absolute path.  [ruby-dev:38594]
+
 Thu Jun 11 15:27:17 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/prime.rb: documentation typo fixed.  a patch from okkez.
diff --git a/file.c b/file.c
index 3d5c33bd7..4ea759fa3 100644
--- a/file.c
+++ b/file.c
@@ -2723,6 +2723,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
 	p = buf + (s - b);
 	BUFCHECK(bdiff >= buflen);
 	memset(buf, '/', p - buf);
+	rb_enc_copy(result, fname);
     }
     if (p > buf && p[-1] == '/')
 	--p;
diff --git a/version.h b/version.h
index a69866630..f30cf0515 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 173
+#define RUBY_PATCHLEVEL 174
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1