diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ruby.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -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. @@ -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); |