vim: always diff verticaly

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 34da981aca40b3ae32ecda8e6d97818b8967b363..ec0ece1b93de9e1a570e98c439e8d51f0bf47612 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -158,8 +158,12 @@ set foldlevelstart=0            " value for 'foldlevel' when starting to edit a
 " save and restore folds
 set viewoptions=folds,cursor    " don't save local options
 
+" diff mode {{{2
+set diffopt=filler,vertical
+
 " reading and writing files {{{2
-set nomodeline                  " don't read modelines
+set modeline                    " read modelines
+set modelines=2                 " only check first/last 2 lines
 set writebackup                 " write a backup file before overwriting a file
 set backup                      " keep a backup after owerwriting a file
 set backupdir=$XDG_CACHE_HOME/vim//
@@ -329,7 +333,7 @@ cnoremap <C-L>   <Right>
 nnoremap zx zMzxzz15<C-e>
 
 " edit vimrc in new tab
-nmap <leader>ev :tabedit $MYVIMRC<CR>
+nmap <leader>ev :tabedit $MYVIMRC<CR>:lcd %:p:h<CR>
 
 map <F1> :ls<CR>:b<space>
 
@@ -504,4 +508,3 @@ function! g:ToggleNumber()
 endfunction
 nnoremap <silent><leader>n :call g:ToggleNumber()<cr>
 nnoremap <silent><leader>N :setlocal relativenumber!<cr>
-