From: martin f. krafft <madduck@madduck.net>
Date: Sat, 5 Sep 2009 10:06:05 +0000 (+0200)
Subject: merge words
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/dce1f8994a417a091045fe27aa93dbe5e1cd6520?hp=ac353c7f6879ba6c2bf0fec432a757452b0c497a

merge words
---

diff --git a/.vim/colors/madduck.vim b/.vim/colors/madduck.vim
index 6d62396d..3947d394 100644
--- a/.vim/colors/madduck.vim
+++ b/.vim/colors/madduck.vim
@@ -56,7 +56,7 @@ else
   hi mailQuoted5            ctermfg=darkmagenta
   hi mailQuoted6            ctermfg=darkgreen
 
-  hi Error      ctermfg=White       ctermbg=Red     cterm=reverse   term=reverse
+  hi Error     ctermfg=White       ctermbg=Red     cterm=none   term=none
   hi Todo      ctermfg=Black       ctermbg=Yellow  cterm=standout  term=standout
 
   hi SpellBad		ctermfg=white	ctermbg=darkred	cterm=none	term=reverse
diff --git a/.vim/ftplugin/tex.vim b/.vim/ftplugin/tex.vim
index 4e3bb1e0..7d3361ff 100644
--- a/.vim/ftplugin/tex.vim
+++ b/.vim/ftplugin/tex.vim
@@ -1,3 +1,5 @@
 let Tex_UsePython = 1
 
 let Tex_FoldedMisc = "preamble,<<<"
+
+"let g:Imap_UsePlaceHolders = 0
diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add
index e6048106..56a3f851 100644
--- a/.vim/spell/en.utf-8.add
+++ b/.vim/spell/en.utf-8.add
@@ -1,83 +1,88 @@
-pleonastic
-Tarde's
-pleonastic
+ADSL
+Ajzen
+Akkerman
+alioth
+alright
+anonymise
+anonymised
+anonymising
+autotools
 B
-S
+blog
+blogged
+bo
+Boehm
+BTS
+c0ffee
+changelog
 cosmopolite
-trialable
-learnable
-Homophily
-homophilous
-Trialability
 cosmopoliteness
+deadbeef
+debhelper
+debian
 Debian
-Slackware
+Debianisation
+debianised
 Debian's
+Delphis
+devel
+diff
+dpkg
+EFTE
+Farquhar
+Fishbein
+freenode
+Genericity
 hamm
-debian
-mdadm
-svn
-blogged
-blog
+heterophilous
+heterophily
+Heterophily
+homophilous
+homophily
+Homophily
+iff
+IRC
+Jun
+learnable
+lenny
+Likert
+lintian
+localite
 madduck
-vcs
-upstream's
-ADSL
-diff
-snapshotted
-debianised
-Debianisation
-changelog
-screenshot
+mdadm
 namespace
+oldstable
+panelist
+panelists
+peercolation
+Peercolation
+phd
+pkg
+pleonastic
+RC
 rebase
-rebasing
-alright
-alioth
-iff
 rebases
-workflow
-lenny
-deadbeef
-c0ffee
-tarballs
-dpkg
-BTS
-freenode
-IRC
+rebasing
 rex
-bo
-Troup
+s
+S
 Schulze
-Wichert
-Akkerman
-RC
-oldstable
+screenshot
+Slackware
+snapshotted
+svn
 tarball
+tarballs
+Tarde's
+tesseract
+trialability
 Trialability
-Fishbein
-Ajzen
-workflows
-homophily
-Heterophily
-heterophilous
-heterophily
-localite
-Debian
-EFTE
-anonymised
-Delphis
-Farquhar
-Boehm
-s
-vi
-devel
-pkg
-panelists
-anonymise
-panelist
-anonymising
-Jun
-Likert
+trialable
+Troup
 Ubuntu
-peercolation
+upstream's
+vcs
+vi
+Wichert
+workflow
+workflows
diff --git a/.vimrc b/.vimrc
index 176cf781..2855c1c8 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
@@ -1450,14 +1451,28 @@ autocmd BufNewFile,BufRead /etc/logcheck/*.d*/* set tw=0
 autocmd BufNewFile,BufRead /home/madduck/debian/pkg/logcheck/*/rulefiles/linux/*.d*/* 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
+
+" 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,6 +1510,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,6 +1529,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