1 files changed, 7 insertions, 18 deletions
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,14 +200,7 @@ 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
@@ -211,14 +208,6 @@ class  DefaultDisplay
   end
 
   ######################################################################
-
-  def page_output(pager)
-    STDOUT.reopen(@save_stdout) if @save_stdout
-    @save_stdout = nil
-    pager.close if pager
-  end
-
-  ######################################################################
   
   def display_params(method)