From 9111bbf8182708acb9f8d9689c441c3b6c591386 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 1 May 2010 05:06:21 +0000
Subject: Upgrade to RDoc 2.5.8

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/ri/driver.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib/rdoc/ri')

diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
index 9083f6c67a..b5523355d5 100644
--- a/lib/rdoc/ri/driver.rb
+++ b/lib/rdoc/ri/driver.rb
@@ -1034,7 +1034,11 @@ Options may also be set in the 'RI' environment variable.
     pagers = [ENV['RI_PAGER'], ENV['PAGER'], 'pager', 'less', 'more']
 
     pagers.compact.uniq.each do |pager|
-      io = IO.popen(pager, "w") rescue next
+      next unless File.exist? pager
+
+      io = IO.popen pager, "w" rescue next
+
+      next if $? and $?.exited? # pager didn't work
 
       @paging = true
 
-- 
cgit v1.2.3