vim: don't save local options in views

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index c52eb6bd6d768ac01e8ec8839e15b38e602badfb..111300a59120aed2acb5cfdd80b0b7467acb1c92 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -6,12 +6,12 @@
 " use xdg
 set runtimepath=$XDG_CONFIG_HOME/vim,$VIMRUNTIME,$XDG_CONFIG_HOME/vim/after
 
+" bundles {{{1
 filetype off
 set rtp+=$XDG_DATA_HOME/vim/vundle
 call vundle#rc('$XDG_DATA_HOME/vim')
 
 Bundle 'gmarik/vundle'
-Bundle 'wincent/Command-T'
 Bundle 'bling/vim-airline'
 Bundle 'ctrlp.vim'
 Bundle 'fugitive.vim'
@@ -86,7 +86,7 @@ endif
 set background=dark             " Dark background, d'uh!
 syntax on
 
-set spelllang=en,de,fr          " list of accepted languages
+set spelllang=en_gb             " list of accepted languages
 set dictionary=spell            " list of dictionary files for keyword completion
 " toggle spell-checking
 map <silent><F10> :set nospell!<CR>:set nospell?<CR>
@@ -184,7 +184,7 @@ nmap <Leader>m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2<CR>
 
 " folding {{{1
 set foldmethod=marker           " folding type
-set foldlevelstart=99           " value for 'foldlevel' when starting to edit a file
+set foldlevelstart=0            " value for 'foldlevel' when starting to edit a file
 
 " space will toggle current fold in normal mode
 nnoremap <silent> <Space> @=(foldlevel('.')?'za':"\<Space>")<CR>
@@ -192,6 +192,7 @@ nnoremap <silent> <Space> @=(foldlevel('.')?'za':"\<Space>")<CR>
 vnoremap <Space> zf
 
 " save and restore folds
+set viewoptions=folds,cursor    " don't save local options
 autocmd BufWinLeave *.* mkview
 autocmd BufWinEnter *.* silent loadview