aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/ri/paths.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b20702521..e35cff473b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 16 21:02:30 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/rdoc/ri/paths.rb (RDoc::RI::Paths.each): HOMEDIR can be nil
+ if $HOME is unset.
+
Thu Sep 16 20:16:07 2010 Akinori MUSHA <knu@iDaemons.org>
* LEGAL: Rephrase the leading sentences for clarification. Avoid
diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb
index df12045203..9b338d7ad8 100644
--- a/lib/rdoc/ri/paths.rb
+++ b/lib/rdoc/ri/paths.rb
@@ -26,7 +26,7 @@ module RDoc::RI::Paths
# true
# :site:: Where ri for installed libraries are stored. Yielded when
# +site+ is true. Normally no ri data is stored here.
- # :home:: ~/.ri. Yielded when +home+ is true.
+ # :home:: ~/.rdoc. Yielded when +home+ is true.
# :gem:: ri data for an installed gem. Yielded when +gems+ is true.
# :extra:: ri data directory from the command line. Yielded for each
# entry in +extra_dirs+
@@ -38,7 +38,7 @@ module RDoc::RI::Paths
yield SYSDIR, :system if system
yield SITEDIR, :site if site
- yield HOMEDIR, :home if home
+ yield HOMEDIR, :home if home and HOMEDIR
gemdirs.each do |dir|
yield dir, :gem