yugui	2009-07-12 23:44:37 +0900 (Sun, 12 Jul 2009)

  New Revision: 24045

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24045

  Log:
    merges r23889 from trunk into ruby_1_9_1.
    --
    * file.c (file_expand_path): should copy original encoding.
      [ruby-dev:38612]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/file.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24044)
+++ ruby_1_9_1/ChangeLog	(revision 24045)
@@ -1,3 +1,8 @@
+Mon Jun 29 17:14:31 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (file_expand_path): should copy original encoding.
+	  [ruby-dev:38612]
+
 Sat Jun 27 03:09:04 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* io.c (argf_rewind): need to rewind $. and ARGF.lineno.
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24044)
+++ ruby_1_9_1/version.h	(revision 24045)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-07-12"
-#define RUBY_PATCHLEVEL 208
+#define RUBY_PATCHLEVEL 209
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_1/file.c
===================================================================
--- ruby_1_9_1/file.c	(revision 24044)
+++ ruby_1_9_1/file.c	(revision 24045)
@@ -2665,7 +2665,7 @@
 	    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 */

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/