diff options
| author | Jesse Luehrs <doy@tozt.net> | 2011-03-01 03:18:23 -0600 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2011-03-01 03:18:23 -0600 |
| commit | 5f460255215c8432bf05e6dd678103da53811f18 (patch) | |
| tree | f2cd000f71a47e58bf67deec831fe7f39b905e46 /vimrc | |
| parent | 40548eb6f2b9f8dae616d856b95cee9961e8ff5a (diff) | |
| download | conf-5f460255215c8432bf05e6dd678103da53811f18.tar.gz conf-5f460255215c8432bf05e6dd678103da53811f18.zip | |
steal more vim config from sartak
Diffstat (limited to 'vimrc')
| -rw-r--r-- | vimrc | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -64,7 +64,7 @@ set hlsearch " highlight matching parens for .2s set showmatch -set matchtime=2 +set matchtime=1 " threshold for reporting number of lines changed set report=0 @@ -233,6 +233,9 @@ autocmd InsertEnter * syn clear EOLWS | syn match EOLWS excludenl /\s\+\%#\@!$/ autocmd InsertLeave * syn clear EOLWS | syn match EOLWS excludenl /\s\+$/ highlight EOLWS ctermbg=red guibg=red " }}} +" conflict markers {{{ +match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$' +" }}} " fonts {{{ if has('win32') || has('win64') || has('win32unix') set guifont=Lucida_Console @@ -248,9 +251,6 @@ autocmd BufReadPost * \ exe "normal g`\"" | \ endif " }}} -" Auto +x {{{ -au BufWritePost *.{sh,pl} silent exe "!chmod +x %" -" }}} " Update ctags after writing {{{ autocmd BufWritePost * if filereadable('tags') | silent exe "!ctags -a %" | redraw | endif " }}} @@ -274,6 +274,9 @@ function s:ask_quit (msg, proposed_action) endif endfunction " }}} +" Source vimrc after editing {{{ +autocmd BufWritePost {,.}vimrc source ~/.vimrc +" }}} " Misc {{{ autocmd BufWritePost *conkyrc silent exe "!killall -HUP conky" autocmd QuickFixCmdPost * copen 3 @@ -433,7 +436,7 @@ nmap <CR> <C-]> nmap <BS> <C-T> " }}} " Nopaste {{{ -function s:nopaste(visual) +function! s:nopaste(visual) let nopaste_services = $NOPASTE_SERVICES if &filetype == 'tex' let $NOPASTE_SERVICES = "Mathbin ".$NOPASTE_SERVICES @@ -552,9 +555,6 @@ nnoremap <Leader><Leader> <Leader> " clear the search highlight nmap <silent><Leader>/ :nohl<CR> -" toggle line numbers -nmap <silent><Leader>n :set invnumber<CR> - " manually resync the syntax highlighting nmap <silent><Leader>s :syntax sync fromstart<CR> " }}} |