Only use old vim plugin when necessary

1 files changed, 6 insertions, 10 deletions

diff --git a/vimrc b/vimrc
index eaa034d..8c31a89 100644
--- a/vimrc
+++ b/vimrc
@@ -22,16 +22,9 @@ Plug 'jalvesaq/R-Vim-runtime'
 Plug 'jranke/vim-pandoc', { 'branch': 'rmd' }
 Plug 'vim-pandoc/vim-pandoc-syntax'
 
-if !has('nvim')
-  Plug 'jcfaria/Vim-R-plugin' " for my vim version 7.4, legacy plugin not maintained by Jakson any more
-else
-  Plug 'jalvesaq/Nvim-R'
-endif
-
-call plug#end()
-
-" legacy Vim-R-plugin plugin {{{1
-if !has('nvim')
+if !exists("*job_getchannel")
+  " for vim versions <= 7.4.1453 use the legacy plugin not maintained any more
+  Plug 'jcfaria/Vim-R-plugin', { 'commit': 'd726d619f12a10fb5ac7967d373837735cff60f0' }
   "let vimrplugin_vsplit = 0
   "let vimrplugin_rconsole_width = 100
 
@@ -46,12 +39,15 @@ if !has('nvim')
   "vnoremap  r  *@<Esc>:call SendSelectionToR("echo", "down")<CR>
   " but this does not work as expected
 else
+  Plug 'jalvesaq/Nvim-R'
   vmap r <Esc>:call SendSelectionToR("echo", "down")<CR>
   "let R_source_args = "print.eval = TRUE"
   let R_vsplit = 1
   let R_assign = 0
 endif
 
+call plug#end()
+
 " R syntax {{{1
 let r_syntax_folding = 0
 let rmd_syn_hl_chunk = 1