From abf45abeac827d8f79f620d33a46366c865f7ae8 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 12 May 2010 06:51:34 +0000
Subject: [PATCH] merge from trunk (r27749)

* lib/rdoc/generator/ri.rb (generate): should load existing cache
  before generating it.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 5 +++++
 lib/rdoc/generator/ri.rb | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 6b7ac6819a..3181c88f78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 12 15:50:20 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rdoc/generator/ri.rb (generate): should load existing cache
+	  before generating it.
+
 Wed May 12 15:37:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (flo_to_s): make minimum string representation.
diff --git a/lib/rdoc/generator/ri.rb b/lib/rdoc/generator/ri.rb
index ad9932a02a..819eb52d40 100644
--- a/lib/rdoc/generator/ri.rb
+++ b/lib/rdoc/generator/ri.rb
@@ -29,6 +29,8 @@ class RDoc::Generator::RI
   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}"