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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/ruby.c b/ruby.c
index 7bbc5b0139..5093b66a4d 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)) {