summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/rdoc.rb2
-rw-r--r--lib/rdoc/ri/driver.rb6
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/rdoc.rb b/lib/rdoc.rb
index 7467ef2965..7ce7b53a35 100644
--- a/lib/rdoc.rb
+++ b/lib/rdoc.rb
@@ -383,7 +383,7 @@ module RDoc
##
# RDoc version you are using
- VERSION = '2.5.7'
+ VERSION = '2.5.8'
##
# Name of the dotfile that contains the description of files to be processed
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