diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-12 14:44:37 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-12 14:44:37 +0000 |
commit | aa2d3e79a3639a45022a545310a1ca5f5b4e5673 (patch) | |
tree | fbee18f1241c94355a8ba2156d23df028a1d95b8 | |
parent | 372ad24a7721872eee784c975b0e03a704ed65b6 (diff) | |
download | ruby-aa2d3e79a3639a45022a545310a1ca5f5b4e5673.tar.gz ruby-aa2d3e79a3639a45022a545310a1ca5f5b4e5673.tar.xz ruby-aa2d3e79a3639a45022a545310a1ca5f5b4e5673.zip |
merges r23889 from trunk into ruby_1_9_1.
--
* file.c (file_expand_path): should copy original encoding.
[ruby-dev:38612]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Jun 29 17:14:31 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (file_expand_path): should copy original encoding. + [ruby-dev:38612] + Sat Jun 27 03:09:04 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * io.c (argf_rewind): need to rewind $. and ARGF.lineno. @@ -2665,7 +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()); + rb_enc_copy(result, fname); } else { /* specified drive, but not full path */ @@ -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 |