summaryrefslogtreecommitdiff
path: root/ruby.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-23 10:49:13 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-12-23 10:49:13 +0000
commit9afa601a90f9198a053b6daa3c51dc09711f919d (patch)
tree58a7c34355ee8846ae882566edda4e0ae6165962 /ruby.c
parent91c7169daf6f900ca03c58a7743a0b991e8f5371 (diff)
merges r30084 from trunk into ruby_1_9_2.
-- * ruby.c (load_file_internal): decrement for ungotten line. [ruby-dev:42680] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ruby.c b/ruby.c
index e61711d9a0..541ef88bd2 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1536,6 +1536,7 @@ load_file_internal(VALUE arg)
rb_funcall(f, set_encoding, 1, rb_enc_from_encoding(enc));
if (opt->xflag) {
+ line_start--;
search_shebang:
forbid_setid("-x");
opt->xflag = FALSE;