merges r23729 from trunk into ruby_1_9_1.

--
* file.c (file_expand_path): drive letter is ascii only.
  [ruby-dev:38612]

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

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index cd8dd30c41..d9833f846e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 18 01:29:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (file_expand_path): drive letter is ascii only.
+	  [ruby-dev:38612]
+
 Wed Jun 17 23:46:08 2009  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* rational.c (nurat_coerce): accepts Complex when the imag is
diff --git a/file.c b/file.c
index 4ea759fa37..a4082b9b1f 100644
--- a/file.c
+++ b/file.c
@@ -2665,6 +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());
 	}
 	else {
 	    /* specified drive, but not full path */
diff --git a/version.h b/version.h
index 496b63cae9..38ebbf3d96 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 187
+#define RUBY_PATCHLEVEL 188
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1