diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-17 12:40:30 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-17 12:40:30 +0000 |
commit | 8561ae195fd8561a6b7f9f59276b1b4042de0d89 (patch) | |
tree | 132c1d24e038a6858c693108f5ab991c1f73b5b9 | |
parent | 1d3a253e0243beb8ce52b5136b4a9325b08a1b6b (diff) | |
download | ruby-8561ae195fd8561a6b7f9f59276b1b4042de0d89.tar.gz |
* ruby.c (process_options): revert r30549.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | gem_prelude.rb | 1 | ||||
-rw-r--r-- | ruby.c | 2 |
3 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Mon Jan 17 21:40:25 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ruby.c (process_options): revert r30549. + Sun Jan 16 20:55:45 2011 Tanaka Akira <akr@fsij.org> * vsnprintf.c: parenthesize macro arguments. diff --git a/gem_prelude.rb b/gem_prelude.rb index e69de29bb2..3d4516f341 100644 --- a/gem_prelude.rb +++ b/gem_prelude.rb @@ -0,0 +1 @@ +require 'rubygems.rb' if defined?(Gem) @@ -1365,7 +1365,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt) } } if (!(opt->disable & DISABLE_BIT(gems))) { - rb_autoload(rb_cObject, rb_intern("Gem"), "rubygems"); + rb_define_module("Gem"); } ruby_init_prelude(); ruby_set_argv(argc, argv); |