Import RDoc 2.2.2 r192

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 9 deletions

diff --git a/lib/rdoc/ri/display.rb b/lib/rdoc/ri/display.rb
index 05a7cf253..7b0158c18 100644
--- a/lib/rdoc/ri/display.rb
+++ b/lib/rdoc/ri/display.rb
@@ -5,8 +5,8 @@ require 'rdoc/ri'
 begin
   require('readline')
   require('abbrev')
-  CAN_USE_READLINE = true
-rescue
+  CAN_USE_READLINE = true # HACK use an RDoc namespace constant
+rescue LoadError
   CAN_USE_READLINE = false
 end
 
@@ -53,7 +53,7 @@ class RDoc::RI::DefaultDisplay
 
   def display_class_info(klass)
     page do
-      superclass = klass.superclass_string
+      superclass = klass.superclass
 
       if superclass
         superclass = " < " + superclass
@@ -217,7 +217,7 @@ class RDoc::RI::DefaultDisplay
         end
         method_names.sort!
 
-        @formatter.wrap method_names.join(',')
+        @formatter.wrap method_names.join(', ')
       end
     end
 
@@ -390,4 +390,3 @@ class RDoc::RI::DefaultDisplay
   end
 
 end
-
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
index 037606ec2..2f72b9dfd 100644
--- a/lib/rdoc/ri/paths.rb
+++ b/lib/rdoc/ri/paths.rb
@@ -28,15 +28,13 @@ module RDoc::RI::Paths
 
   VERSION = RbConfig::CONFIG['ruby_version']
 
-  ri = RbConfig::CONFIG['RUBY_INSTALL_NAME'].sub(/ruby/, 'ri')
-  base    = File.join(RbConfig::CONFIG['datadir'], ri, VERSION)
+  base    = File.join(RbConfig::CONFIG['datadir'], "ri", VERSION)
   SYSDIR  = File.join(base, "system")
   SITEDIR = File.join(base, "site")
   homedir = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH']
 
   if homedir then
-    rdoc = RbConfig::CONFIG['RUBY_INSTALL_NAME'].sub(/ruby/, 'rdoc')
-    HOMEDIR = File.join(homedir, ".#{rdoc}")
+    HOMEDIR = File.join(homedir, ".rdoc")
   else
     HOMEDIR = nil
   end