Merge branch 'master' of ssh://jrwb.de/dotfiles

Conflicts:
	bashrc

2 files changed, 1 insertions, 5 deletions

diff --git a/bashrc b/bashrc
index ddbc10c..8aa56fc 100644
--- a/bashrc
+++ b/bashrc
@@ -46,11 +46,6 @@ export RTOP=~/svn/R
 export DEBEMAIL=jranke@uni-bremen.de
 export DEBFULLNAME="Johannes Ranke"
 # }}}
-# ssh-agent {{{
-if [ -z "$SSH_AUTH_SOCK" ]; then
-  eval `ssh-agent -s`
-fi
-# }}}
 # rdkit {{{
 # RDKIT (commented out on 2015-10-02 as I am using the Debian package python-rdkit
 #export RDBASE="$HOME/git/rdkit"
diff --git a/vimrc b/vimrc
index e1f7033..e1c59d7 100644
--- a/vimrc
+++ b/vimrc
@@ -23,6 +23,7 @@ Plug 'jranke/vim-pandoc', { 'branch': 'rmd' }
 Plug 'vim-pandoc/vim-pandoc-syntax'
 " 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' }