drbrain	2008-02-15 07:38:20 +0900 (Fri, 15 Feb 2008)

  New Revision: 15478

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/ri/paths.rb

  Log:
    Preserve ri compatibility with 1.8

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15478&r2=15477&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/ri/paths.rb?r1=15478&r2=15477&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15477)
+++ ChangeLog	(revision 15478)
@@ -1,3 +1,7 @@
+Fri Feb 15 07:37:40 2008  Eric Hodel  <drbrain@s...>
+
+	* lib/rdoc/ri/paths.rb: Preserve compatibility with 1.8.
+
 Fri Feb 15 02:42:25 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (ftruncate): check if available.
Index: lib/rdoc/ri/paths.rb
===================================================================
--- lib/rdoc/ri/paths.rb	(revision 15477)
+++ lib/rdoc/ri/paths.rb	(revision 15478)
@@ -43,7 +43,8 @@
   PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)}
 
   begin
-    require 'rubygems' unless defined?(Gem) and Gem::Enable
+    require 'rubygems' unless defined?(Gem) and defined?(Gem::Enable) and
+                              Gem::Enable
 
     # HACK dup'd from Gem.latest_partials and friends
     all_paths = []

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