From f894133daaeea0874c2032d27932ea7719efadf4 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 30 Oct 2008 14:36:09 +0000 Subject: merges r20056 from trunk into ruby_1_9_1. * ruby.c (load_file_internal): should not set script encoding to ASCII-8BIT. * ruby.c (load_file_internal): do not auto convert scripts even when default_internal is set. [ruby-core:19579] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ruby.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ruby.c') diff --git a/ruby.c b/ruby.c index 7bbc5b013..5093b66a4 100644 --- a/ruby.c +++ b/ruby.c @@ -1356,9 +1356,9 @@ load_file_internal(VALUE arg) enc = rb_locale_encoding(); } else { - enc = rb_ascii8bit_encoding(); + enc = rb_usascii_encoding(); } - rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc)); + rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-")); tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start); rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser)); if (script && rb_parser_end_seen_p(parser)) { -- cgit