X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/cdaa27f1decaaa2fcc12aea15dbe7fb2ed2c0a64..4e0877a8959afe2e323a8761a22d8c294e18a142:/.vimrc?ds=inline

diff --git a/.vimrc b/.vimrc
index 27aeeb4..3ae5792 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
@@ -1100,6 +1097,7 @@ set dir=.,$TMPDIR//,/var/tmp//,/tmp//
 " swapsync
 " "sync", "fsync" or empty; how to flush a swap file to disk
 "       set sws=fsync
+set sws=
 
 " updatecount
 " number of characters typed to cause a swap file update
@@ -1108,6 +1106,7 @@ set dir=.,$TMPDIR//,/var/tmp//,/tmp//
 " updatetime
 " time in msec after which the swap file will be updated
 "       set ut=4000
+set ut=10000
 
 " maxmem
 " maximum amount of memory in Kbyte used for one buffer
@@ -1421,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
@@ -1446,11 +1445,14 @@ 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
+" leave the w mark whenever a file is written
+autocmd BufWrite * normal mw
 
-" 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 i mark whenever we go idle (after updatetime)
+"augroup markidle
+  "autocmd CursorHold * normal mi
+  "autocmd CursorHoldI * normal mi "DISABLED while broken (shifts left)
+"augroup end
 
 " disable list mode when inserting stuff, otherwise keep it enabled, it's
 " useful (see also setting lcs)
@@ -1507,6 +1509,7 @@ nmap ]} :normal }kk<CR>
 
 iab sgf Sehr geehrte Frau
 iab sgh Sehr geehrter Herr
+iab sghn Sehr geehrte Herren
 iab lf Liebe Frau
 iab lh Lieber Herr
 iab sgdh Sehr geehrte Damen und Herren
@@ -1515,14 +1518,21 @@ iab lg liebe Grüsse
 iab Lg Liebe Grüsse
 iab fg Freundliche Grüsse
 iab mfg Mit freundlichen Grüssen
-iab mbbg Mit bundesbrüderlichen Grüßen
-iab mvbg Mit verbandsbrüderlichen Grüßen
+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 &cpo=s:cpo_save
 unlet s:cpo_save
@@ -1531,3 +1541,5 @@ source $HOME/.vim/macros/table.vim
 
 let g:SuperTabMappingForward = '<nul>'
 let g:SuperTabMappingBackward = '<s-nul>'
+
+let g:is_posix = 1