From ab3e8e6143049662cf724c8574cd9fb8e248a4a0 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 14 Feb 2008 22:38:20 +0000
Subject: [PATCH] Preserve ri compatibility with 1.8

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15478 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog            | 4 ++++
 lib/rdoc/ri/paths.rb | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 0f6190baf2..a00277a2d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Feb 15 07:37:40 2008  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc/ri/paths.rb: Preserve compatibility with 1.8.
+
 Fri Feb 15 02:42:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ftruncate): check if available.
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
index 035d0fc242..b4b6c64925 100644
--- a/lib/rdoc/ri/paths.rb
+++ b/lib/rdoc/ri/paths.rb
@@ -43,7 +43,8 @@ module RDoc::RI::Paths
   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 = []