diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-03 16:17:32 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-03 16:17:32 +0000 |
commit | de1b460c10b153fd844d8f6ce1b4b6f9f15734f2 (patch) | |
tree | f91084ce2d7e0fcf489cbae5199a8b32fe8d11bf /lib/rdoc | |
parent | c87618706e7569995fe0bea93cf3f7793f3e2bb1 (diff) | |
download | ruby-de1b460c10b153fd844d8f6ce1b4b6f9f15734f2.tar.gz ruby-de1b460c10b153fd844d8f6ce1b4b6f9f15734f2.tar.xz ruby-de1b460c10b153fd844d8f6ce1b4b6f9f15734f2.zip |
* lib/rdoc/ri/ri_display.rb (DefaultDisplay::page): wait until the
pager terminates.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
-rw-r--r-- | lib/rdoc/ri/ri_display.rb | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/lib/rdoc/ri/ri_display.rb b/lib/rdoc/ri/ri_display.rb index d07f59553..1e371350d 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) |