X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/409e1493ea45058136564685915ae4dd6c8a427a..44519b1729b75562dfa2ed5b1346f1ff1907c9dc:/.vimrc

diff --git a/.vimrc b/.vimrc
index 209d079..2493369 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1108,6 +1108,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
@@ -1448,16 +1449,34 @@ 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
+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
+  "autocmd CursorHoldI * normal mi "DISABLED while broken (shifts left)
+"augroup end
 
 " disable list mode when inserting stuff, otherwise keep it enabled, it's
-" useful
+" useful (see also setting lcs)
 augroup listinsert
   autocmd InsertEnter * set nolist
   autocmd InsertLeave * set list
 augroup end
+" flag trailing spaces as error only when not inserting
+augroup tsperrorinsert
+  autocmd InsertEnter * match none /\s\+$/
+  autocmd InsertLeave * match Error /\s\+$/
+augroup end
 
 if &cp | set nocp | endif
 let s:cpo_save=&cpo
@@ -1495,8 +1514,14 @@ map <Leader>sy :echo synIDattr(synID(line("."), col("."), 1), "name")<CR>
 
 map <Leader>/ :nohlsearch<CR>
 
+omap [{ :normal {jj<CR>
+nmap [{ :normal {jj<CR>
+omap ]} :normal }kk<CR>
+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
@@ -1509,6 +1534,10 @@ iab mbbg Mit bundesbrüderlichen Grüßen
 iab mvbg Mit verbandsbrüderlichen Grüßen
 iab vd Vielen Dank
 iab vld Vielen lieben Dank
+iab email e-mail
+iab emails e-mails
+iab Email E-mail
+iab Emails E-mails
 
 let &cpo=s:cpo_save
 unlet s:cpo_save
@@ -1517,5 +1546,3 @@ source $HOME/.vim/macros/table.vim
 
 let g:SuperTabMappingForward = '<nul>'
 let g:SuperTabMappingBackward = '<s-nul>'
-
-match Error /\s\+$/