From 60e38b6efb7582f3c419ec7b06ed9579e4310b43 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 13 Jan 2008 04:50:48 +0000 Subject: * ruby.c (load_file): script files should not be affected by locale. [ruby-dev:33054] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ruby.c | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 883d48692e..74bb677100 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jan 13 13:50:46 2008 Nobuyoshi Nakada + + * ruby.c (load_file): script files should not be affected by locale. + [ruby-dev:33054] + Sun Jan 13 12:01:32 2008 Eric Hodel * lib/rdoc/generators*: Reorganize RDoc generators. diff --git a/ruby.c b/ruby.c index d8e698c073..e3b700bdc1 100644 --- a/ruby.c +++ b/ruby.c @@ -1151,8 +1151,12 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o } require_libraries(); /* Why here? unnatural */ } - if (opt->enc_index >= 0) rb_enc_associate_index(f, opt->enc_index); - else rb_enc_associate(f, rb_locale_encoding()); + if (opt->enc_index >= 0) { + rb_enc_associate_index(f, opt->enc_index); + } + else if (f == rb_stdin) { + rb_enc_associate(f, rb_locale_encoding()); + } tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start); if (script && rb_parser_end_seen_p(parser)) { rb_define_global_const("DATA", f); -- cgit v1.2.3