usa	2008-01-31 15:48:35 +0900 (Thu, 31 Jan 2008)

  New Revision: 15357

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/ri/display.rb
    trunk/lib/rdoc/ri/formatter.rb

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


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/ri/formatter.rb?r1=15357&r2=15356&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15357&r2=15356&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/ri/display.rb?r1=15357&r2=15356&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15356)
+++ ChangeLog	(revision 15357)
@@ -1,7 +1,14 @@
+Thu Jan 31 15:46:30 2008  NAKAMURA Usaku  <usa@r...>
+
+	* lib/rdoc/ri/formatter.rb (output): add accessor.
+
+	* lib/rdoc/ri/display.rb (page): replace @formatter.output instead of
+	  $stdout.
+
 Thu Jan 31 15:06:50 2008  NARUSE, Yui  <naruse@r...>
 
-	* marshal.c (r_object0): call r_entry/r_leave to call proc when TYPE_FIXNUM,
-	  TYPE_NIL, TYPE_TRUE, TYPE_FALSE, TYPE_SYMBOL.
+	* marshal.c (r_object0): call r_entry/r_leave to call proc when
+	  TYPE_FIXNUM, TYPE_NIL, TYPE_TRUE, TYPE_FALSE, TYPE_SYMBOL.
 
 Thu Jan 31 14:03:38 2008  NAKAMURA Usaku  <usa@r...>
 
Index: lib/rdoc/ri/formatter.rb
===================================================================
--- lib/rdoc/ri/formatter.rb	(revision 15356)
+++ lib/rdoc/ri/formatter.rb	(revision 15357)
@@ -4,6 +4,7 @@
 class RDoc::RI::Formatter
 
   attr_reader :indent
+  attr_accessor :output
 
   FORMATTERS = { }
 
Index: lib/rdoc/ri/display.rb
===================================================================
--- lib/rdoc/ri/display.rb	(revision 15356)
+++ lib/rdoc/ri/display.rb	(revision 15357)
@@ -177,11 +177,11 @@
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/