summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-03 05:22:51 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-03 05:22:51 +0000
commit2fc40194d2ddc05a481c0eddc8fe9a1c95e23196 (patch)
treef34c93e28c863cce0574dfd6fc77a22992177e6c
parent46a93a65df6e51c8317cd958d44f21313b5a28ee (diff)
* lib/rdoc/ri/driver.rb (setup_pager): no need to check the existence
of pagers. the following code checks whether they are executable or not. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28842 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/rdoc/ri/driver.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ac35bc..279334b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 3 14:19:42 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/rdoc/ri/driver.rb (setup_pager): no need to check the existence
+ of pagers. the following code checks whether they are executable or
+ not.
+
Tue Aug 3 12:03:57 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* tool/runruby.rb: no purelib.
diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb
index 90fbc7c..7ae73a4 100644
--- a/lib/rdoc/ri/driver.rb
+++ b/lib/rdoc/ri/driver.rb
@@ -1034,7 +1034,7 @@ 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|
- next unless File.exist? pager
+ next unless pager
io = IO.popen pager, "w" rescue next