X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/264389589f068f95b353b7634fa28623aaa5047e..b046e31ffa99bf1f4000bdf3ded4f16a4c05cb61:/.vimrc diff --git a/.vimrc b/.vimrc index 267c407..d9ac3e1 100644 --- a/.vimrc +++ b/.vimrc @@ -1,5 +1,3 @@ -version 7.1 - " obtained from the output of :options, then postprocessed: " d2} " :%s/^ *[[:digit:]]\+/""" @@ -672,7 +670,7 @@ set fo=tcroqn1l " pattern to recognize a numbered list " (local to buffer) " set flp=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s* -let &flp='^\v\s*((\a|\d+)[\]:.)}\t/-]\s|[-\*.·→+]\s)\s*' +let &flp='^\v\s*(((\a|\d+)[]:.)}/-])+|[-\*.·→+])\s+' " formatexpr " expression used for "gq" to format lines @@ -1443,24 +1441,17 @@ set vi=<1000,'1000,\"1000,:100,/100,@100,f1,%,!,h,n$VARDIR/vim/viminfo " set to "msg" to see all error messages " set debug= +if &cp | set nocp | endif +let s:cpo_save=&cpo +set cpo&vim + filetype plugin indent on syntax on colorscheme madduck -autocmd BufNewFile,BufRead /etc/logcheck/*.d*/* set tw=0 -autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/*.d*/* set tw=0 -autocmd BufNewFile,BufRead /home/madduck/.tmp/dir????? set tw=0 - -" jump to last known position in file (:he last-position-jump) -autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g`\"zz" | endif - " leave the w mark whenever a file is written autocmd BufWrite * normal mw -" keep an extra backup of vimperator's ctrl-i -autocmd BufWritePost */vimperator-*.tmp exe 'write ' . fnameescape((exists('$TMPDIR') ? $TMPDIR : '/tmp') . '/vimperator.ctrl-i.' . strftime('%Y.%m.%d.%H%M%S')) -autocmd BufWritePost */pentadactyl.*.txt exe 'write ' . fnameescape((exists('$TMPDIR') ? $TMPDIR : '/tmp') . '/pentadactyl.ctrl-i.' . strftime('%Y.%m.%d.%H%M%S')) - autocmd BufRead *.vcf set filetype=vcard " leave the i mark whenever we go idle (after updatetime) @@ -1481,10 +1472,6 @@ augroup tsperrorinsert autocmd InsertLeave * match Error /\s\+$/ augroup end -if &cp | set nocp | endif -let s:cpo_save=&cpo -set cpo&vim - " treat wrapped lines normally nnoremap k gk nnoremap gk @@ -1504,10 +1491,6 @@ map Q let mapleader = ';' let maplocalleader = ';' -imap -- – -imap --- — -imap ... … - " replace fake tab chars with real ones map ft :%s,⇝·*, ,g:nohlsearch`` " replace fake spaces with real ones @@ -1538,23 +1521,16 @@ iab hg Herzliche Grüsse iab mhg Mit herzlichen Grüssen iab mbbg Mit bundesbrüderlichen Grüssen iab mvbg Mit verbandsbrüderlichen Grüssen -iab vd Vielen Dank -iab vld Vielen lieben Dank -iab vhd Vielen herzlichen Dank -iab email e-mail -iab emails e-mails -iab Email E-mail -iab Emails E-mails -iab mk Martin Krafft -iab mfk Martin F. Krafft -iab addr Hanfstaenglstraße 15 D–80638 München -let &cpo=s:cpo_save -unlet s:cpo_save +let g:airline_theme='minimalist' -source $HOME/.vim/macros/table.vim - -let g:SuperTabMappingForward = '' -let g:SuperTabMappingBackward = '' +try + execute pathogen#infect() +catch + "echo "Pathogen not installed" +endtry let g:is_posix = 1 + +let &cpo=s:cpo_save +unlet s:cpo_save