X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/a32543f15a69002a5c6af67dfecb95b2776bf463..31709000e699fab4086d5a7dddfcdb1b63460bc3:/.vimrc diff --git a/.vimrc b/.vimrc index b8b22ef..91a3b66 100644 --- a/.vimrc +++ b/.vimrc @@ -1,6 +1,3 @@ -" vim: set ft=vim : -version 7.1 - " obtained from the output of :options, then postprocessed: " d2} " :%s/^ *[[:digit:]]\+/""" @@ -673,7 +670,7 @@ set fo=tcroqn1l " pattern to recognize a numbered list " (local to buffer) " set flp=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s* -set flp=^\\s*\\d\\+[\\]:.)}]\\s* +let &flp='^\v\s*((\a|\d+)[\]:.)}\t/-]\s|[-\*.·→+]\s)\s*' " formatexpr " expression used for "gq" to format lines @@ -1423,7 +1420,7 @@ set vdir=$VARDIR/vim/view " viminfo " list that specifies what to write in the viminfo file " set vi= -set vi='1000,f1,\"1000,:20,/20,%,!,h,n$VARDIR/vim/viminfo +set vi=<1000,'1000,\"1000,:100,/100,@100,f1,%,!,h,n$VARDIR/vim/viminfo " bufhidden " what happens with a buffer when it's no longer in a window @@ -1444,23 +1441,17 @@ set vi='1000,f1,\"1000,:20,/20,%,!,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')) - " leave the i mark whenever we go idle (after updatetime) "augroup markidle "autocmd CursorHold * normal mi @@ -1479,10 +1470,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 @@ -1531,17 +1518,23 @@ iab lg liebe Grüsse iab Lg Liebe Grüsse iab fg Freundliche Grüsse iab mfg Mit freundlichen Grüssen -iab mbg Mit besten Grüssen +iab mbg Mit den besten Grüssen 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 g:is_posix = 1 let &cpo=s:cpo_save unlet s:cpo_save