summaryrefslogtreecommitdiff
path: root/vimrc
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2018-01-22 17:29:01 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2018-01-22 17:29:01 +0100
commit67df8c99223fc8f8e9b03be9712758e2191768b5 (patch)
tree8a4f1c52464dd6d915b4b66ce0c568ff83f5c730 /vimrc
parent2a147e1098271b90b595e16a37449f4db28f2cfc (diff)
parentebd7e9bbbaed28f36472fe520c98c44c36175d24 (diff)
Merge branch 'master' of https://github.com/jranke/dotfiles
Diffstat (limited to 'vimrc')
-rw-r--r--vimrc14
1 files changed, 13 insertions, 1 deletions
diff --git a/vimrc b/vimrc
index a65131c..5f781a9 100644
--- a/vimrc
+++ b/vimrc
@@ -1,5 +1,5 @@
" vimrc of Johannes Ranke
-" Last Change: Tue Sep 12, 2017 at 09:52 AM +0200
+" Last Change: Mon Jan 22, 2018 at 05:28 PM +0100
" default settings (much is handled by tpope/sensible) {{{1
set ts=2
set sw=2
@@ -33,6 +33,7 @@ Plug 'jranke/lastchange.vim', { 'branch': 'jranke' }
Plug 'vim-scripts/DeleteTrailingWhitespace'
" R plugin {{{2
+<<<<<<< HEAD
" 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")
@@ -58,6 +59,17 @@ else
"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'
+>>>>>>> ebd7e9bbbaed28f36472fe520c98c44c36175d24
" 2}}}
call plug#end()

Contact - Imprint