From aa2d3e79a3639a45022a545310a1ca5f5b4e5673 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 12 Jul 2009 14:44:37 +0000 Subject: 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 --- ChangeLog | 5 +++++ file.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1527cb9c..087e28804 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 29 17:14:31 2009 Nobuyoshi Nakada + + * file.c (file_expand_path): should copy original encoding. + [ruby-dev:38612] + Sat Jun 27 03:09:04 2009 Yukihiro Matsumoto * io.c (argf_rewind): need to rewind $. and ARGF.lineno. diff --git a/file.c b/file.c index a4082b9b1..050cbd2d6 100644 --- a/file.c +++ b/file.c @@ -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 */ diff --git a/version.h b/version.h index 91fdffa00..806f9ce3f 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit