summaryrefslogtreecommitdiff
path: root/lib/rdoc
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-31 06:48:35 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-31 06:48:35 +0000
commit1672df18704da19c8abfa5c544de37790d1da19a (patch)
treed411ddd6b39a11392d3b223bfe9c89ca57a75cd7 /lib/rdoc
parentb0a18f4d9fb6125549776fe29a188e749a0a8073 (diff)
* lib/rdoc/ri/formatter.rb (output): add accessor.
* lib/rdoc/ri/display.rb (page): replace @formatter.output instead of $stdout. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
-rw-r--r--lib/rdoc/ri/display.rb6
-rw-r--r--lib/rdoc/ri/formatter.rb1
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/rdoc/ri/display.rb b/lib/rdoc/ri/display.rb
index 3b24ef04ba..fa331c46c2 100644
--- a/lib/rdoc/ri/display.rb
+++ b/lib/rdoc/ri/display.rb
@@ -177,11 +177,11 @@ class RDoc::RI::DefaultDisplay
def page
if pager = setup_pager then
begin
- orig_stdout = $stdout
- $stdout = pager
+ orig_output = @formatter.output
+ @formatter.output = pager
yield
ensure
- $stdout = orig_stdout
+ @formatter.output = orig_output
pager.close
end
else
diff --git a/lib/rdoc/ri/formatter.rb b/lib/rdoc/ri/formatter.rb
index 14327fb4a8..d88cef1e3c 100644
--- a/lib/rdoc/ri/formatter.rb
+++ b/lib/rdoc/ri/formatter.rb
@@ -4,6 +4,7 @@ require 'rdoc/markup'
class RDoc::RI::Formatter
attr_reader :indent
+ attr_accessor :output
FORMATTERS = { }