remove vcscommand plugin

[etc/vim.git] / .vimrc

diff --git a/.vimrc b/.vimrc
index 41a351e1260ed6368d5d1921a9ae48d184dcf5e2..89e06d2e9bf7bdbbae5197cfacfb4cd2ac923fac 100644 (file)
--- a/.vimrc
+++ b/.vimrc
@@ -1,6 +1,3 @@
-" vim: set ft=vim :
-version 7.1
-

 " obtained from the output of :options, then postprocessed:
 "   d2}
 "   :%s/^ *[[:digit:]]\+/"""
 " obtained from the output of :options, then postprocessed:
 "   d2}
 "   :%s/^ *[[:digit:]]\+/"""


@@ -673,7 +670,7 @@ set fo=tcroqn1l
 " pattern to recognize a numbered list
 "       (local to buffer)
 "       set flp=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s*
 " pattern to recognize a numbered list
 "       (local to buffer)
 "       set flp=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s*

-set flp=^\\v[[:space:]]*([[:digit:]]\|[[:alpha:]]){1,2}[\\]:.)}[:space:]][[:space:]]+
+let &flp='^\v\s*((\a|\d+)[\]:.)}\t/-]\s|[-\*.·→+]\s)\s*'

 
 " formatexpr
 " expression used for "gq" to format lines
 
 " formatexpr
 " expression used for "gq" to format lines


@@ -1444,25 +1441,17 @@ set vi=<1000,'1000,\"1000,:100,/100,@100,f1,%,!,h,n$VARDIR/vim/viminfo
 " set to "msg" to see all error messages
 "       set debug=
 
 " set to "msg" to see all error messages
 "       set debug=
 

+if &cp | set nocp | endif
+let s:cpo_save=&cpo
+set cpo&vim
+

 filetype plugin indent on
 syntax on
 colorscheme madduck
 
 filetype plugin indent on
 syntax on
 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
-

 " leave the w mark whenever a file is written
 autocmd BufWrite * normal mw
 
 " 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'))
-
-autocmd BufRead *.vcf set filetype=vcard
-

 " leave the i mark whenever we go idle (after updatetime)
 "augroup markidle
   "autocmd CursorHold * normal mi
 " leave the i mark whenever we go idle (after updatetime)
 "augroup markidle
   "autocmd CursorHold * normal mi


@@ -1481,10 +1470,6 @@ augroup tsperrorinsert
   autocmd InsertLeave * match Error /\s\+$/
 augroup end
 
   autocmd InsertLeave * match Error /\s\+$/
 augroup end
 

-if &cp | set nocp | endif
-let s:cpo_save=&cpo
-set cpo&vim
-

 " treat wrapped lines normally
 nnoremap k gk
 nnoremap <Up> gk
 " treat wrapped lines normally
 nnoremap k gk
 nnoremap <Up> gk


@@ -1504,10 +1489,6 @@ map Q <Esc>
 let mapleader = ';'
 let maplocalleader = ';'
 
 let mapleader = ';'
 let maplocalleader = ';'
 

-imap <Leader>-- –
-imap <Leader>--- —
-imap <Leader>... …
-

 " replace fake tab chars with real ones
 map <Leader>ft :%s,⇝·*,     ,g<CR>:nohlsearch<CR>``
 " replace fake spaces with real ones
 " replace fake tab chars with real ones
 map <Leader>ft :%s,⇝·*,     ,g<CR>:nohlsearch<CR>``
 " replace fake spaces with real ones


@@ -1538,23 +1519,10 @@ iab hg Herzliche Grüsse
 iab mhg Mit herzlichen Grüssen
 iab mbbg Mit bundesbrüderlichen Grüssen
 iab mvbg Mit verbandsbrüderlichen Grüssen
 iab mhg Mit herzlichen Grüssen
 iab mbbg Mit bundesbrüderlichen Grüssen
 iab mvbg Mit verbandsbrüderlichen Grüssen

-iab vd Vielen Dank
-iab vld Vielen lieben Dank
-iab vhd Vielen herzlichen Dank
-iab email e-mail
-iab emails e-mails
-iab Email E-mail
-iab Emails E-mails
-iab mk Martin Krafft
-iab mfk Martin F. Krafft
-iab addr Hanfstaenglstraße 15\rD–80638 München
-
-let &cpo=s:cpo_save
-unlet s:cpo_save
-
-source $HOME/.vim/macros/table.vim

 
 

-let g:SuperTabMappingForward = '<nul>'
-let g:SuperTabMappingBackward = '<s-nul>'
+execute pathogen#infect()

 
 let g:is_posix = 1
 
 let g:is_posix = 1

+
+let &cpo=s:cpo_save
+unlet s:cpo_save