aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2010-09-18 14:23:52 -0400
committerRalph Amissah <ralph@amissah.com>2010-09-22 10:01:35 -0400
commit244f9e9671e15892beb2e5b2e7e7e88a3785b8e7 (patch)
treeef372908c1c5160ceeeaacbbcc1c93687ef987b7
parentoptions, bullet proof matches for --long-options (effects minor fix) (diff)
urls, sysenv, set manpage viewer to "man"
-rw-r--r--lib/sisu/v2/sysenv.rb3
-rw-r--r--lib/sisu/v2/urls.rb4
2 files changed, 5 insertions, 2 deletions
diff --git a/lib/sisu/v2/sysenv.rb b/lib/sisu/v2/sysenv.rb
index 12348dc3..395559a8 100644
--- a/lib/sisu/v2/sysenv.rb
+++ b/lib/sisu/v2/sysenv.rb
@@ -2005,6 +2005,9 @@ WOK
? @rc['program_select']['odf_viewer'] \
: 'oowriter' #'odf-viewer','oowriter'
end
+ def manpage_viewer
+ 'man'
+ end
def manpage_generator
((defined? @rc['program_select']['man']) \
&& @rc['program_select']['man'] =~/\S\S+/) \
diff --git a/lib/sisu/v2/urls.rb b/lib/sisu/v2/urls.rb
index 1011eda4..951a787a 100644
--- a/lib/sisu/v2/urls.rb
+++ b/lib/sisu/v2/urls.rb
@@ -220,7 +220,7 @@ module SiSU_urls
end
if x=~/^i/ \
and @opt.cmd =~/i/
- SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_generator} #{@env.path.manpage}/#{@fnb}.1 |most").result
+ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_viewer} #{@env.path.manpage}/#{@fnb}.1").result
@opt.cmd.gsub!(/I/,'')
end
if x=~/^P/ \
@@ -264,7 +264,7 @@ module SiSU_urls
when /^I/
SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","cd #{@env.path.texinfo}; pinfo ./#{@fnb}.#{y}; cd -")
when /^i/
- SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_generator} #{@env.path.manpage}/#{@fnb}.1 |most")
+ SiSU_Screen::Ansi.new(@opt.cmd,"-#{x}","#{@prog.manpage_viewer} #{@env.path.manpage}/#{@fnb}.1")
end
unless @opt.cmd =~/q/
tellx.result if tellx