diff --git a/ChangeLog b/ChangeLog
index 94a3ebb8af..16cbc6fe81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
-Wed Mar  3 18:58:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar  4 01:17:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rdoc/ri/ri_display.rb (DefaultDisplay::setup_pager): ensure
-	  pager closes and stdout is restored.
+	* lib/rdoc/ri/ri_display.rb (DefaultDisplay::page): wait until the
+	  pager terminates.
 
 Wed Mar  3 13:10:56 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
diff --git a/lib/rdoc/ri/ri_display.rb b/lib/rdoc/ri/ri_display.rb
index d07f595531..1e371350dc 100644
--- a/lib/rdoc/ri/ri_display.rb
+++ b/lib/rdoc/ri/ri_display.rb
@@ -183,11 +183,15 @@ class  DefaultDisplay
   ######################################################################
 
   def page
-    pager = setup_pager
+    return yield unless pager = setup_pager
     begin
+      save_stdout = STDOUT.clone
+      STDOUT.reopen(pager)
       yield
     ensure
-      page_output(pager)
+      STDOUT.reopen(save_stdout)
+      save_stdout.close
+      pager.close
     end
   end
 
@@ -196,28 +200,13 @@ class  DefaultDisplay
   def setup_pager
     unless @options.use_stdout
       for pager in [ ENV['PAGER'], "less", "more", 'pager' ].compact.uniq
-        begin
-          pager = IO.popen(pager, "w")
-        rescue
-        else
-          @save_stdout = STDOUT.clone
-          STDOUT.reopen(pager)
-          return pager
-        end
+        return IO.popen(pager, "w") rescue nil
       end
       @options.use_stdout = true
       nil
     end
   end
 
-  ######################################################################
-
-  def page_output(pager)
-    STDOUT.reopen(@save_stdout) if @save_stdout
-    @save_stdout = nil
-    pager.close if pager
-  end
-
   ######################################################################
   
   def display_params(method)