From 4514a6bee646262b62db7438cc149a7ff651adb4 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 12 Mar 2008 18:13:48 +0000
Subject: * lib/irb/cmd/help.rb: should be updated for new ri structure.  
 [ruby-core:15825]

* lib/rdoc/ri/driver.rb (RDoc::initialize): allow options to be optional.

* lib/rdoc/ri/driver.rb (RDoc::class_cache): map_dirs may be
  empty.

* lib/rdoc/ri/driver.rb (RDoc::get_info_for): revive get_info_for
  method.  maybe broken.

* lib/rdoc/ri/util.rb (RDoc::initialize): should not use RiError
  no more.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15761 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/irb/cmd/help.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib/irb/cmd/help.rb')

diff --git a/lib/irb/cmd/help.rb b/lib/irb/cmd/help.rb
index 8e0b0586fb..e1f47e2c97 100644
--- a/lib/irb/cmd/help.rb
+++ b/lib/irb/cmd/help.rb
@@ -8,20 +8,21 @@
 #   
 #
 
-require 'rdoc/ri/ri_driver'
+require 'rdoc/ri/driver'
+require 'rdoc/ri/util'
 
 module IRB
   module ExtendCommand
     module Help
       begin
-        @ri = RiDriver.new
+        @ri = RDoc::RI::Driver.new
       rescue SystemExit
       else
         def self.execute(context, *names)
           names.each do |name|
             begin
               @ri.get_info_for(name.to_s)
-            rescue RiError
+            rescue RDoc::RI::Error
               puts $!.message
             end
           end
-- 
cgit v1.2.3