Mercurial > dotfiles.old
changeset 94:c31e63aba1dd
Use better colors for matching parentheses
author | zegervdv <zegervdv@me.com> |
---|---|
date | Thu, 07 Aug 2014 19:25:27 +0200 |
parents | 8278ded5eb8c |
children | 619c054f81f3 |
files | vimrc |
diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/vimrc Thu Aug 07 19:11:30 2014 +0200 +++ b/vimrc Thu Aug 07 19:25:27 2014 +0200 @@ -5,7 +5,7 @@ set laststatus=2 set noshowmode -let g:pathogen_disabled = ['ack','ctrlp', 'yankring'] +let g:pathogen_disabled = ['ack'] execute pathogen#infect() set backspace=2 @@ -104,8 +104,6 @@ " Set leader to , let mapleader = "," -map <Leader>d :bp<bar>sp<bar>bn<bar>bd<CR> - " See long lines as line breaks map j gj map k gk @@ -117,7 +115,7 @@ execute "keepjumps normal! `z" Pulse endfunction -nnoremap <c-$> :silent! call JumpToTag()<cr> +nnoremap <C-$> :silent! call JumpToTagInSplit()<CR> " Jump to end of line in insert mode inoremap <C-a> <C-o>I @@ -170,8 +168,8 @@ nnoremap gV `[v`] " Briefly change colour of last highlight -nnoremap <silent> n n:call HLNext(0.4)<cr> -nnoremap <silent> N N:call HLNext(0.4)<cr> +" nnoremap <silent> n n:call HLNext(0.4)<cr> +" nnoremap <silent> N N:call HLNext(0.4)<cr> function! HLNext (blinktime) highlight WhiteOnRed ctermfg=white ctermbg=red guifg=white guibg=red @@ -185,6 +183,9 @@ redraw endfunction +" Highlight matching parenthesis in different color so I don't mess up +hi MatchParen cterm=underline ctermbg=none ctermfg=white gui=underline guifg=white + " Highlight VCS conflict markers match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'