summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/ri/ri_options.rb6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ebfb3c89a..c88fd64d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan 11 02:07:47 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
+ Also accept command line options via the 'RI' environment variable.
+
Sat Jan 10 23:01:41 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
diff --git a/lib/rdoc/ri/ri_options.rb b/lib/rdoc/ri/ri_options.rb
index c62335c147..0e720a9c64 100644
--- a/lib/rdoc/ri/ri_options.rb
+++ b/lib/rdoc/ri/ri_options.rb
@@ -150,6 +150,7 @@ module RI
end
puts
end
+ puts "Options may also be passed in the 'RI' environment varaible"
exit 0
end
end
@@ -164,6 +165,11 @@ module RI
@formatter = RI::TextFormatter.for("plain")
@list_classes = false
+ old_argv = ARGV.dup
+ if ENV["RI"]
+ ARGV.replace(ENV["RI"].split.concat(ARGV))
+ end
+
begin
go = GetoptLong.new(*OptionList.options)