X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/a54fe85887be07b871056d52af66f509eadc9bf3..966b9444bb93aab229e2b6b03d183fed700e1762:/.vimrc?ds=inline

diff --git a/.vimrc b/.vimrc
index 779375b..1030ac6 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1453,11 +1453,16 @@ autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/*
 autocmd BufReadPost * if line("'\"") > 0 && line("'\"") <= line("$") | exe "normal g'\"zz" | endif
 
 " 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,6 +1500,11 @@ 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 lf Liebe Frau
@@ -1509,8 +1519,15 @@ 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
 
 source $HOME/.vim/macros/table.vim
+
+let g:SuperTabMappingForward = '<nul>'
+let g:SuperTabMappingBackward = '<s-nul>'