From 8561ae195fd8561a6b7f9f59276b1b4042de0d89 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 17 Jan 2011 12:40:30 +0000 Subject: * ruby.c (process_options): revert r30549. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ gem_prelude.rb | 1 + ruby.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 62ffa9e2c4..3bcce1d479 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Jan 17 21:40:25 2011 Nobuyoshi Nakada + + * ruby.c (process_options): revert r30549. + Sun Jan 16 20:55:45 2011 Tanaka Akira * 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) diff --git a/ruby.c b/ruby.c index b4d0bddf07..61a293e57e 100644 --- a/ruby.c +++ b/ruby.c @@ -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); -- cgit v1.2.3