usa	2010-05-12 15:51:34 +0900 (Wed, 12 May 2010)

  New Revision: 27750

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

  Log:
    merge from trunk (r27749)
    
    * lib/rdoc/generator/ri.rb (generate): should load existing cache
      before generating it.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/rdoc/generator/ri.rb

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 27749)
+++ ruby_1_9_2/ChangeLog	(revision 27750)
@@ -1,3 +1,8 @@
+Wed May 12 15:50:20 2010  NAKAMURA Usaku  <usa@r...>
+
+	* lib/rdoc/generator/ri.rb (generate): should load existing cache
+	  before generating it.
+
 Wed May 12 15:37:08 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* numeric.c (flo_to_s): make minimum string representation.
Index: ruby_1_9_2/lib/rdoc/generator/ri.rb
===================================================================
--- ruby_1_9_2/lib/rdoc/generator/ri.rb	(revision 27749)
+++ ruby_1_9_2/lib/rdoc/generator/ri.rb	(revision 27750)
@@ -29,6 +29,8 @@
   def generate top_levels
     install_siginfo_handler
 
+    @store.load_cache
+
     RDoc::TopLevel.all_classes_and_modules.each do |klass|
       @current = "#{klass.class}: #{klass.full_name}"
 

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