drbrain	2011-01-19 12:33:00 +0900 (Wed, 19 Jan 2011)

  New Revision: 30602

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30602

  Log:
    Always enable rubygems/custom_require

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30601)
+++ ChangeLog	(revision 30602)
@@ -3,6 +3,11 @@
 	* proc.c (proc_call): Add gc guard to avoid segfault. The fix
 	  is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963]
 
+Wed Jan 19 12:31:28 2011  Eric Hodel <drbrain@s...>
+
+	* lib/rubygems.rb: Since gem_prelude requires rubygems, enable
+	  custom_require always.
+
 Wed Jan 19 12:08:08 2011  Eric Hodel <drbrain@s...>
 
 	* lib/rubygems/commands/dependency_command.rb: Remove require of
Index: lib/rubygems.rb
===================================================================
--- lib/rubygems.rb	(revision 30601)
+++ lib/rubygems.rb	(revision 30602)
@@ -1223,7 +1223,7 @@
 # Ruby 1.9 allows --disable-gems, so we require it when we didn't detect a Gem
 # constant at rubygems.rb load time.
 
-require 'rubygems/custom_require' unless RUBY_VERSION > '1.9'
+require 'rubygems/custom_require'
 
 Gem.clear_paths
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/