From 11a634300dccd27ce6731517ea681305d5fd78a6 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 31 Jan 2008 06:48:35 +0000
Subject: 	* lib/rdoc/ri/formatter.rb (output): add accessor.

	* lib/rdoc/ri/display.rb (page): replace @formatter.output instead of
	  $stdout.



git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/ri/display.rb   | 6 +++---
 lib/rdoc/ri/formatter.rb | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/rdoc/ri/display.rb b/lib/rdoc/ri/display.rb
index 3b24ef04b..fa331c46c 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 14327fb4a..d88cef1e3 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 = { }
 
-- 
cgit