* ruby.c (load_file): set default to ASCII-8BIT explicitly if -K

  option is not given.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index b422149fa..1237aaab7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 25 17:12:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file): set default to ASCII-8BIT explicitly if -K
+	  option is not given.
+
 Fri Jan 25 16:31:47 2008  Tanaka Akira  <akr@fsij.org>
 
 	* include/ruby/intern.h (rb_str_buf_cat_ascii): declared.
diff --git a/ruby.c b/ruby.c
index 739d78f44..2de86c917 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1207,11 +1207,9 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o
 	}
     }
     else {
-	enc = 0;
-    }
-    if (enc) {
-	rb_funcall(f, rb_intern("set_encoding"), 1, rb_enc_from_encoding(enc));
+	enc = rb_ascii8bit_encoding();
     }
+    rb_funcall(f, rb_intern("set_encoding"), 1, rb_enc_from_encoding(enc));
     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);