From 235f2ec0d9ac8d2c563ac8a0fa065a9cfa9babed Mon Sep 17 00:00:00 2001 From: Von Random Date: Mon, 17 Nov 2014 12:28:43 +0300 Subject: [PATCH] compatibility changes to vimrc --- vimrc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/vimrc b/vimrc index 2e607fb..aa098c2 100644 --- a/vimrc +++ b/vimrc @@ -13,7 +13,6 @@ set incsearch set background=dark set noexpandtab set fileencodings=ucs-bom,utf-8,default,latin1 -set helplang=en set hlsearch set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc set termencoding=utf-8 @@ -27,9 +26,6 @@ set foldmethod=marker " disable bell set noerrorbells visualbell t_vb= -set list -set listchars=tab:\|\ ,trail:*,nbsp:x - " set indentation options for specific file types autocmd FileType ruby setlocal sts=2 sw=2 expandtab autocmd FileType eruby setlocal sts=2 sw=2 expandtab @@ -43,6 +39,11 @@ nmap k gk " still have to deal with old vim versions :< if v:version >= 703 + set helplang=en + + set list + set listchars=tab:\|\ ,trail:*,nbsp:x + " enable case indentation let g:sh_indent_case_labels=1 @@ -50,7 +51,7 @@ if v:version >= 703 if filereadable(expand("$HOME/.vim/bundle/Vundle.vim/autoload/vundle.vim")) filetype off set rtp+=~/.vim/bundle/Vundle.vim/ - call vundle#begin() + silent! call vundle#begin() Plugin 'gmarik/Vundle.vim' "plugin manager " general plugins @@ -81,7 +82,7 @@ if v:version >= 703 Plugin 'dag/vim-fish' "fish Plugin 'puppetlabs/puppet-syntax-vim' "puppet Plugin 'nagios-syntax' "nagios / icinga - call vundle#end() + silent! call vundle#end() " airline options if &t_Co > 88 || has("gui_running")