summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-02 13:13:45 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-02 13:13:45 +0000
commit166fedb45d6f08f4f2eaca3de53c14180f92afbb (patch)
tree4a7e4c60927a332be214386bcc67340c5d885330
parent386962af112ca41169f37bd7a8bea9517bfb2fc8 (diff)
* lib/rdoc/rdoc.rb: reverted r27186 to add generators.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/rdoc/rdoc.rb7
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 881fa361a1..32517c9123 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 2 22:13:38 2010 Nobuyoshi Nakada <[email protected]>
+
+ * lib/rdoc/rdoc.rb: reverted r27186 to add generators.
+
Fri Apr 2 21:17:43 2010 Nobuyoshi Nakada <[email protected]>
* NEWS: added reverse_lookup option.
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index bdd9dc8858..b2c7d55b77 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -426,7 +426,6 @@ rescue LoadError
end
# require built-in generators after discovery in case they've been replaced
-module RDoc::Generator
- autoload :Darkfish, 'rdoc/generator/darkfish'
- autoload :RI, 'rdoc/generator/ri'
-end
+require 'rdoc/generator/darkfish'
+require 'rdoc/generator/ri'
+