Merge branch 'master' of tardis:/dotfiles

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 4abe137b5ec416f55d44695c9db3665a2f882bd2..9de1144091f5e3f033a5f2873f979c802a2c57dc 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -410,6 +410,7 @@ nnoremap <silent> <leader>gs :Gstatus<CR>
 nnoremap <silent> <leader>gd :Gdiff<CR>
 nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gd :Gdiff<CR>
 nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>

+nnoremap <silent> <leader>gb :Gblame<cr>

 
 " NERDTree {{{2
 " open/close NERDTree with \e
 
 " NERDTree {{{2
 " open/close NERDTree with \e


@@ -458,9 +459,9 @@ let g:ycm_autoclose_preview_window_after_insertion = 1
 "let g:ycm_extra_conf_vim_data = ['%:p']
 nnoremap <leader>jd :YcmCompleter GoTo<CR>
 
 "let g:ycm_extra_conf_vim_data = ['%:p']
 nnoremap <leader>jd :YcmCompleter GoTo<CR>
 

-" vim-easy-align
+" vim-easy-align {{{2

 " start interactive EasyAlign in visual mode
 " start interactive EasyAlign in visual mode

-vnoremap <Enter> <Plug>(EasyAlign)
+vnoremap <CR> <Plug>(EasyAlign)

 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0
 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0