2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b03d653970..45a2b3ed53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar  2 10:13:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (load_file): parse shebang in us-ascii.  a patch from
+	  sheepman <sheepman AT sheepman.sakura.ne.jp> in [ruby-dev:33955]
+
 Sun Mar  2 00:08:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* object.c (rb_cstr_to_dbl): check for successive underscores.
diff --git a/ruby.c b/ruby.c
index 7fca2969b8..90dbfe2e3f 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1155,6 +1155,9 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o
 	int no_src_enc = !opt->src.enc.name;
 	int no_ext_enc = !opt->ext.enc.name;
 
+	enc = rb_usascii_encoding();
+	rb_funcall(f, rb_intern("set_encoding"), 1, rb_enc_from_encoding(enc));
+
 	if (opt->xflag) {
 	    forbid_setid("-x");
 	    opt->xflag = Qfalse;