Remove support for old vim, complete switch to neovim

2 files changed, 10 insertions, 42 deletions

diff --git a/bashrc b/bashrc
index 0cab765..3339876 100644
--- a/bashrc
+++ b/bashrc
@@ -20,23 +20,6 @@ PATH=/usr/local/lib/R/site-library/littler/examples:"${PATH}"
 # RPython
 export RPYTHON_PYTHON_VERSION=3
 
-# Vim-R-plugin
-# From r-plugin-bash-setup help page in Vim-R-plugin (Debian package 1.2-1)
-# Change the TERM environment variable (to get 256 colors) and make Vim 
-# connect to th X Server even if running in a terminal emulator (many of 
-# the plugin features depend on this). Now only needed for "old" vim
-# like vim 7.4 from Debian stable
-if [ "x$DISPLAY" != "x" ]
-then
-		if [ "screen" = "$TERM" ]
-		then
-				export TERM=screen-256color
-		else
-				export TERM=xterm-256color
-		fi
-		alias vim='vim --servername VIM'
-fi
-
 alias tarxz='tar --use-compress-program=pxz -c -v -f'
 
 # Path where the R sources are
diff --git a/vimrc b/vimrc
index bebcd16..2aee15c 100644
--- a/vimrc
+++ b/vimrc
@@ -1,5 +1,5 @@
 " vimrc of Johannes Ranke
-" Last Change: Mon May 22, 2017 at 07:20 PM +0200
+" Last Change: Mon Jan 22, 2018 at 05:19 PM +0100
 " default settings (much is handled by tpope/sensible) {{{1
 set ts=2
 set sw=2
@@ -33,30 +33,15 @@ Plug 'jranke/lastchange.vim', { 'branch': 'jranke' }
 Plug 'vim-scripts/DeleteTrailingWhitespace'
 
 " R plugin {{{2
-" for vim versions <= 7.4.1453 use the legacy plugin
-" Note that on wheezy, vim is too old even for that
-if !has('nvim') && !exists("*job_getchannel")
-  Plug 'jcfaria/Vim-R-plugin', { 'commit': 'd726d619f12a10fb5ac7967d373837735cff60f0' }
-
-  let vimrplugin_map_r = 1 " is silent per default, therefore tried
-  "vnoremap  r  *@<Esc>:call SendSelectionToR("echo", "down")<CR>
-  " but this does not work as expected
-
-  let vimrplugin_assign = 0
-  let rmd_syn_hl_chunk = 1
-  let vimrplugin_pdfviewer = "/usr/bin/okular"
-  let vimrplugin_openpdf = 0
-else
-  Plug 'jalvesaq/Nvim-R'
-  "Plug '~/git/Nvim-R', { 'branch': 'rstudio' }
-  vmap r <Esc>:call SendSelectionToR("echo", "down")<CR>
-  let R_assign = 0
-  let R_pdfviewer = 'okular'
-  let R_openpdf = 0
-  let R_min_editor_width = 100 
-  "let R_in_buffer = 0
-  "let RStudio_cmd = '/usr/bin/rstudio'
-endif
+Plug 'jalvesaq/Nvim-R'
+"Plug '~/git/Nvim-R', { 'branch': 'rstudio' }
+vmap r <Esc>:call SendSelectionToR("echo", "down")<CR>
+let R_assign = 0
+let R_pdfviewer = 'okular'
+let R_openpdf = 0
+let R_min_editor_width = 100 
+"let R_in_buffer = 0
+"let RStudio_cmd = '/usr/bin/rstudio'
 " 2}}}
 
 call plug#end()