Permalink
Browse files

Warn if vimcom version is wrong.

  • Loading branch information...
1 parent b48b605 commit 6ccba0fb65125ebf1ed6f57b240705e1a8ca5340 @jalvesaq jalvesaq committed Oct 13, 2012
Showing with 25 additions and 1 deletion.
  1. +1 −1 autoload/rcomplete.vim
  2. +6 −0 ftplugin/rmd.vim
  3. +6 −0 ftplugin/rnoweb.vim
  4. +6 −0 ftplugin/rrst.vim
  5. +6 −0 r-plugin/common_global.vim
View
2 autoload/rcomplete.vim
@@ -12,7 +12,7 @@ fun! rcomplete#CompleteR(findstart, base)
return match(getline('.')[: (col('.') - 2)], '[[:alnum:].\\]\+$')
else
if b:needsnewomnilist == 1
- call BuildROmniList("GlobalEnv", "none")
+ call BuildROmniList("GlobalEnv", "")
endif
let res = []
if strlen(a:base) == 0
View
6 ftplugin/rmd.vim
@@ -129,6 +129,12 @@ function! RMakeHTMLrmd(t)
endfunction
function! RMakePDFrmd(t)
+ if g:rplugin_vimcomport == 0
+ exe "Py DiscoverVimComPort()"
+ if g:rplugin_vimcomport == 0
+ return
+ endif
+ endif
if g:rplugin_has_pandoc == 0
if executable("pandoc")
let g:rplugin_has_pandoc = 1
View
6 ftplugin/rnoweb.vim
@@ -111,6 +111,12 @@ endfunction
" Sweave and compile the current buffer content
function! RMakePDF(bibtex, knit)
+ if g:rplugin_vimcomport == 0
+ exe "Py DiscoverVimComPort()"
+ if g:rplugin_vimcomport == 0
+ return
+ endif
+ endif
update
call RSetWD()
let pdfcmd = "vim.interlace.rnoweb('" . expand("%:t") . "'"
View
6 ftplugin/rrst.vim
@@ -129,6 +129,12 @@ function! RMakeHTMLrrst(t)
endfunction
function! RMakePDFrrst()
+ if g:rplugin_vimcomport == 0
+ exe "Py DiscoverVimComPort()"
+ if g:rplugin_vimcomport == 0
+ return
+ endif
+ endif
update
call RSetWD()
if g:rplugin_has_rst2pdf == 0
View
6 r-plugin/common_global.vim
@@ -1771,6 +1771,12 @@ function RFillLibList()
endfunction
function RBuildSyntaxFile(...)
+ if g:rplugin_vimcomport == 0
+ exe "Py DiscoverVimComPort()"
+ if g:rplugin_vimcomport == 0
+ return
+ endif
+ endif
if a:0 == 0
let packls = ""
else

0 comments on commit 6ccba0f

Please sign in to comment.