Fix cleanup and diff.

[nethome.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 95fe92e..7cbb6c9 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -1,3 +1,6 @@
+" $Id$
+
+
 if !exists("g:_kratochvil_vimrc")
        let g:_kratochvil_vimrc=1
 
@@ -13,16 +16,11 @@ autocmd! BufRead *.txt
 "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()
 set runtimepath=.,$VIMRUNTIME
 function BufEnter()
        if exists("g:BufEnter_ts")
-               let &ts=g:BufEnter_ts
-               let &sw=g:BufEnter_ts
                unlet g:BufEnter_ts
 
                set autoindent
@@ -33,14 +31,29 @@ function BufEnter()
                runtime! ./../../../../../../../../../../../.vimrc ./../../../../../../../../../../.vimrc ./../../../../../../../../../.vimrc ./../../../../../../../../.vimrc ./../../../../../../../.vimrc ./../../../../../../.vimrc ./../../../../../.vimrc ./../../../../.vimrc ./../../../.vimrc ./../../.vimrc ./../.vimrc ./.vimrc
        endif
 endfunction
+" From Red Hat vimrc - restore the cursor position after the file got opened:
+autocmd BufReadPost * call BufReadPost()
+function BufReadPost()
+       if line("'\"") > 0 && line ("'\"") <= line("$")
+               exe "normal! g'\""
+       endif
+endfunction
 
 set encoding=utf-8
 set termencoding=utf-8
 " fileencoding is detected from fileencodings, first one for empty files
-set fileencodings=utf-8,iso-8859-2
+" 'iso-8859-2,euc-jp' really does not work for 'euc-jp'
+set fileencodings=utf-8,euc-jp,iso-8859-2
 
+set ts=8
+set sw=2
+set sts=2
 ca X x
 syntax off
+let g:loaded_matchparen = 1
+set swapsync=
+" vim-7+ only
+silent! set nofsync
 set noerrorbells
 set ruler
 set ignorecase
@@ -49,7 +62,10 @@ set nowritebackup
 set exrc
 set nostartofline
 set nohlsearch
+set noincsearch
+set nofoldenable
 set fo=tcq1
+set textwidth=78
 set viminfo='100,\"1000,:100,/40
 " FIXME: Learn how to do :tag instead of :tselect with :cstag (used by :tag and CTRL-] if set cst)
 set nocst
@@ -65,7 +81,7 @@ noremap <Esc>N :tn<cr>zz<C-g>
 noremap <Esc>P :tp<cr>zz<C-g>
 noremap <Esc>M :cn<cr>zz<C-g>
 noremap <Esc>L :cp<cr>zz<C-g>
-noremap <Esc>g "myiw:grep<Space>-rw<Space>'<C-r>m'<Space>.
+noremap <Esc>g "myiw:grep<Space>-rEw<Space>'<C-r>m'<Space>.
 noremap <C-]> <C-]>zz<C-g>
 noremap <C-t> <C-t>zz<C-g>
 noremap <C-d> G:r !date '+\%H:\%M:\%S-'<cr>kA
@@ -74,5 +90,7 @@ noremap <Esc>D :set hlsearch<cr>/^[+-][+-]\([^+-].*\\|\)$<cr>
 noremap <Esc>w 0i <Esc>/[^ ]<cr>vf.h"kyf./[^ ]<cr>vf.h"ly0x:r !date -d "`date '+\%Y'`-<C-r>l-<C-r>k" '+\%u'<cr>yypkV:!tr '1234567' 'PUSCPSN'<cr>jV:!tr '1234567' 'otttaoe'<cr>kJxv0xk0llllllplxxjddk0
 noremap * :let ic_save=&ic<cr>:set noic<cr>*:let &ic=ic_save<cr>
 noremap # :let ic_save=&ic<cr>:set noic<cr>#:let &ic=ic_save<cr>
+noremap <C-k> :w<cr>:!aspell --check '%'<cr>:e<cr>
+noremap gq] gq/^. \?$<cr>
 
 endif "!exists("g:_kratochvil_vimrc")