remove broken symlinks

[etc/vim.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index b8b22ef2f1de2b058a0c855cf7d2eb4059368920..6f3d5f6c64b68b24810de9b03f22e49037ce82ec 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -673,7 +673,7 @@ set fo=tcroqn1l
 " pattern to recognize a numbered list
 "       (local to buffer)
 "       set flp=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s*
 " 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
 
 " formatexpr
 " expression used for "gq" to format lines


@@ -1423,7 +1423,7 @@ set vdir=$VARDIR/vim/view
 " viminfo
 " list that specifies what to write in the viminfo file
 "       set vi=
 " 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
 
 " bufhidden
 " what happens with a buffer when it's no longer in a window


@@ -1460,6 +1460,9 @@ 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'))
 
 " 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)
 "augroup markidle
 
 " leave the i mark whenever we go idle (after updatetime)
 "augroup markidle


@@ -1531,17 +1534,21 @@ iab lg liebe Grüsse
 iab Lg Liebe Grüsse
 iab fg Freundliche Grüsse
 iab mfg Mit freundlichen Grüssen
 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 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 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\rD–80638 München

 
 let &cpo=s:cpo_save
 unlet s:cpo_save
 
 let &cpo=s:cpo_save
 unlet s:cpo_save


@@ -1550,3 +1557,5 @@ source $HOME/.vim/macros/table.vim
 
 let g:SuperTabMappingForward = '<nul>'
 let g:SuperTabMappingBackward = '<s-nul>'
 
 let g:SuperTabMappingForward = '<nul>'
 let g:SuperTabMappingBackward = '<s-nul>'

+
+let g:is_posix = 1