yugui	2009-06-21 18:14:39 +0900 (Sun, 21 Jun 2009)

  New Revision: 23783

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

  Log:
    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]

  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 23782)
+++ ruby_1_9_1/ChangeLog	(revision 23783)
@@ -1,3 +1,8 @@
+Fri Jun 12 14:56:50 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* lib/prime.rb: documentation typo fixed.  a patch from okkez.
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23782)
+++ ruby_1_9_1/version.h	(revision 23783)
@@ -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
Index: ruby_1_9_1/file.c
===================================================================
--- ruby_1_9_1/file.c	(revision 23782)
+++ ruby_1_9_1/file.c	(revision 23783)
@@ -2723,6 +2723,7 @@
 	p = buf + (s - b);
 	BUFCHECK(bdiff >= buflen);
 	memset(buf, '/', p - buf);
+	rb_enc_copy(result, fname);
     }
     if (p > buf && p[-1] == '/')
 	--p;

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