improve format-flowed handling

[etc/vim.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 2eab78a20bad96583734da6b2036703d236b9023..e530ec36e38369cd3f17ba24dc20aff084073bf5 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -1,5 +1,6 @@
 " vim: set ft=vim :
 version 7.1
 " vim: set ft=vim :
 version 7.1

+scriptencoding utf-8

 
 " obtained from the output of :options, then postprocessed:
 "   d2}
 
 " obtained from the output of :options, then postprocessed:
 "   d2}


@@ -673,7 +674,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=^\\v[[:space:]]*([[:digit:]]+\|[[:alpha:]])[\\]:.)}[:space:]][[:space:]]+
+let &flp='^\v\s*%(%(\a{1,2}|\d+)[]:.)}\t/-]|[-*.·→+])\s+'

 
 " formatexpr
 " expression used for "gq" to format lines
 
 " formatexpr
 " expression used for "gq" to format lines


@@ -1423,7 +1424,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 +1461,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


@@ -1543,6 +1547,9 @@ iab email e-mail
 iab emails e-mails
 iab Email E-mail
 iab Emails E-mails
 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


@@ -1551,3 +1558,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