vim: use con for ToggleNumber

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 17e2a1e946cc9581ffb873cd2fd45390fae8a9f0..81713c7204d3507305ed62c511d525792d36c8e8 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -330,7 +330,7 @@ cnoremap <C-H>   <Left>
 cnoremap <C-L>   <Right>
 
 " close all folds open fold in cursor
 cnoremap <C-L>   <Right>
 
 " close all folds open fold in cursor

-nnoremap zx zMzxzz15<C-e>
+nnoremap zx zMzxzt

 
 " edit vimrc in new tab
 nmap <leader>ev :tabedit $MYVIMRC<CR>:lcd %:p:h<CR>
 
 " edit vimrc in new tab
 nmap <leader>ev :tabedit $MYVIMRC<CR>:lcd %:p:h<CR>


@@ -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


@@ -460,7 +461,7 @@ nnoremap <leader>jd :YcmCompleter GoTo<CR>
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
 
 " vim-easy-align {{{2
 " start interactive EasyAlign in visual mode

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

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


@@ -511,19 +512,3 @@ nnoremap <silent> <Leader>s :call ToggleSpell()<CR>
 nnoremap <silent> <Leader>S :call SwitchSpell()<CR>
 " fix spelling with first choice
 nnoremap <Leader>f 1z=
 nnoremap <silent> <Leader>S :call SwitchSpell()<CR>
 " fix spelling with first choice
 nnoremap <Leader>f 1z=

-
-" Toggle line numbers {{{2
-function! g:ToggleNumber()
-    if !exists("b:relanum")
-        let b:relanum=1
-    endif
-    if &l:number
-        let b:relanum = &relativenumber
-        setlocal nonumber norelativenumber
-    else
-        let &l:relativenumber = b:relanum
-        setlocal number
-    endif
-endfunction
-nnoremap <silent><leader>n :call g:ToggleNumber()<cr>
-nnoremap <silent><leader>N :setlocal relativenumber!<cr>