3 files changed, 6 insertions, 1 deletions
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  <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)
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);