Skip to content

Commit

Permalink
tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Choi committed Jul 7, 2011
1 parent 304c04a commit b6f49c1
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
File renamed without changes.
13 changes: 6 additions & 7 deletions lib/ri.vim
Expand Up @@ -4,15 +4,14 @@
"
" Buid this path with plugin install program

if exists("g:rdoc_tool")
let s:rdoc_tool = g:rdoc_tool
if exists("g:ri_vim_tool")
let s:ri_vim_tool = g:ri_vim_tool
else
" This is the development version (specific to D Choi's setup)
let s:rdoc_tool = 'ruby -I/home/choi/p/ri_vim/lib /home/choi/p/ri_vim/bin/ri_vim '
let s:ri_vim_tool = 'ruby -I/home/choi/p/ri_vim/lib /home/choi/p/ri_vim/bin/ri_vim '
" Maybe I should make this a relative path
endif

let s:ri_tool = 'ri --format=rdoc '
let s:selectionPrompt = ""
let s:cacheDir = $HOME."/.ri_vim/cache"

Expand Down Expand Up @@ -147,7 +146,7 @@ function! RDocAutoComplete(findstart, base)
endfun

function! s:matchingNames(query)
let command = s:rdoc_tool . shellescape(a:query)
let command = s:ri_vim_tool . shellescape(a:query)
echom command
return split(system(command), '\n')
endfunction
Expand Down Expand Up @@ -204,7 +203,7 @@ function! RubyClassMethodComplete(findstart, base)
endfun

function! s:matchingMethods(classname)
let command = s:rdoc_tool . '-m '. shellescape(a:classname)
let command = s:ri_vim_tool . '-m '. shellescape(a:classname)
return split(system(command), '\n')
endfunction

Expand Down Expand Up @@ -235,7 +234,7 @@ function! s:doSearch()
endfunction

function! s:displayDoc(query)
let bcommand = s:rdoc_tool.'-d '.shellescape(a:query)
let bcommand = s:ri_vim_tool.'-d '.shellescape(a:query)
let res = s:runCommand(bcommand)
" We're caching is strictly so we can use CTRL-o and CTRL-i
" escape any character that could cause a problem in saving the filename
Expand Down
6 changes: 3 additions & 3 deletions ri_vim.gemspec
Expand Up @@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
require "ri_vim/version"

Gem::Specification.new do |s|
s.name = "rivim"
s.name = "ri_vim"
s.version = RIVim::VERSION
s.platform = Gem::Platform::RUBY
s.required_ruby_version = '>= 1.8.6'
Expand All @@ -14,14 +14,14 @@ Gem::Specification.new do |s|
s.summary = %q{Browse Ruby documentation in Vim}
s.description = %q{Browse Ruby documentation in Vim}

s.rubyforge_project = "rivim"
s.rubyforge_project = "ri_vim"

s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
s.require_paths = ["lib"]

message = "* Now please run rivim-install to install the Vim plugin *"
message = "* Now please run ri_vim_install to install the Vim plugin *"
divider = "*" * message.length
s.post_install_message = [divider, message, divider].join("\n")

Expand Down

0 comments on commit b6f49c1

Please sign in to comment.