General merge+cleanup

Fixed auto-tabstop/shiftwidth settings
+noremap ALT-d/D for diff/diffdiff hlsearching

diff --git a/.vimrc b/.vimrc
index c97feba..9a24e11 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -1,6 +1,26 @@
-":version 4.x
-autocmd BufEnter * set sw=8 tabstop=8
-autocmd BufEnter /home/{short,root}/{src,WWW}/* set sw=2 tabstop=2
+"autocmd * * echo "test"
+
+"startup   read      existing     file: BufReadPre BufReadPost BufEnter VimEnter
+"command   read      non-existing file: BufCreate   BufNewFile BufEnter
+"immediate switch to existing     file: BufReadPre BufReadPost BufEnter
+"immediate switch to non-existing file:             BufNewFile BufEnter
+
+autocmd BufCreate,VimEnter *                                            let g:BufEnter_ts= 8
+autocmd BufCreate,VimEnter /home/{short,kratochvil,root}/{src,WWW}/*    let g:BufEnter_ts= 2
+autocmd BufCreate,VimEnter /home/{short,kratochvil,root}/src/*gnokii*/* let g:BufEnter_ts= 8
+autocmd BufCreate,VimEnter *.{i{,.as},s}                                let g:BufEnter_ts=20
+autocmd BufEnter * call BufEnter()
+autocmd VimEnter * call BufEnter()
+function BufEnter()
+       if exists("g:BufEnter_ts")
+               let &ts=g:BufEnter_ts
+               let &sw=g:BufEnter_ts
+               unlet g:BufEnter_ts
+       endif
+endfunction
+
+ca X x
+syntax off
 set autoindent
 set noerrorbells
 set ruler
@@ -8,9 +28,17 @@ set ignorecase
 set nobackup
 set nowritebackup
 set exrc
+set nostartofline
 set nohlsearch
-syntax off
-ca X x
-set fo=tcq2
+set fo=tcq
 set viminfo='100,\"1000,:100,/40
 set tags=./tags,./TAGS,./../tags,./../TAGS,./../../tags,./../../TAGS,./../../../tags,./../../../TAGS,./../../../../tags,./../../../../TAGS,./../../../../../tags,./../../../../../TAGS,./../../../../../../tags,./../../../../../../TAGS,./../../../../../../../tags,./../../../../../../../TAGS,./../../../../../../../../tags,./../../../../../../../../TAGS,./../../../../../../../../../tags,./../../../../../../../../../TAGS,./../../../../../../../../../../tags,./../../../../../../../../../../TAGS,./../../../../../../../../../../../tags,./../../../../../../../../../../../TAGS,/usr/src/redhat/BUILD/tags,/usr/src/redhat/BUILD/TAGS,/usr/include/tags,/usr/include/TAGS
+
+noremap \ep :set invpaste paste?<cr>
+noremap \eq @q
+noremap \e: @:
+noremap \eN :next<cr>
+noremap \eP :prev<cr>
+noremap \ 4 G:r !date '+\%H:\%M:\%S-'\rkA
+noremap \ed :set hlsearch<cr>/^[+-]\([^+-].*\\|\)$<cr>
+noremap \eD :set hlsearch<cr>/^[+-][+-]\([^+-].*\\|\)$<cr>